From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 7 Dec 2004 10:00:20 +0000 (+0000)
Subject: CURLFTPSSL_ALL should make sure that the transfer fails if the data connection
X-Git-Tag: curl-7_12_3~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c78ee11c41e2692909d0e8b30d65b46de50caf47;p=thirdparty%2Fcurl.git

CURLFTPSSL_ALL should make sure that the transfer fails if the data connection
isn't set to encrypted properly
---

diff --git a/lib/ftp.c b/lib/ftp.c
index cc667acdb9..a43ee70511 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -677,12 +677,14 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
       if(result)
         return result;
 
-      if(ftpcode == 200)
+      if(ftpcode/100 == 2)
         /* We have enabled SSL for the data connection! */
         conn->ssl[SECONDARYSOCKET].use = TRUE;
-
       /* FTP servers typically responds with 500 if they decide to reject
          our 'P' request */
+      else if(data->set.ftp_ssl> CURLFTPSSL_CONTROL)
+        /* we failed and bails out */
+        return CURLE_FTP_SSL_FAILED;
     }
   }