From c78ee11c41e2692909d0e8b30d65b46de50caf47 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 7 Dec 2004 10:00:20 +0000 Subject: [PATCH] CURLFTPSSL_ALL should make sure that the transfer fails if the data connection isn't set to encrypted properly --- lib/ftp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ftp.c b/lib/ftp.c index cc667acdb..a43ee7051 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; } }