--- netkit-ftp-ssl-0.17.12+0.2/ftp/ftp.c.orig	2005-10-07 09:05:21.733576736 +0200
+++ netkit-ftp-ssl-0.17.12+0.2/ftp/ftp.c	2005-10-07 09:31:33.717598840 +0200
@@ -1930,8 +1930,13 @@
 	int n;
 
 #ifdef USE_SSL
+        int use_tls = 0;
         if (ssl_enabled) {
 	    n = command("AUTH SSL");
+	    if (n == ERROR) {
+		use_tls = 1;
+		n = command("AUTH TLS");
+	    }
 	    if (n == ERROR) {		/* do normal USER/PASS */
 		printf("SSL not available\n");
 		/* spit the dummy as we will only talk ssl
@@ -1985,6 +1990,17 @@
 		    ssl_active_flag=1;
 		}
 
+		if (use_tls) {
+		    (void) command("PBSZ 0");
+		    if (command("PROT P") != COMPLETE)
+			ssl_encrypt_data = 0;
+		}
+
+		if (!ssl_encrypt_data && ssl_secure_flag) {
+		    fprintf(stderr, "Data connection security level refused.\n");
+		    return ERROR;
+		}
+
 		n = command("USER %s",u);
 		if (n == CONTINUE) {
 			if(p == NULL)