aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-03-20 22:51:08 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-03-20 22:51:08 +0000
commit6421d69bff007ac10f6a5dd2663951c10b4bf9c1 (patch)
tree115aee0d37c30a78bdcdfb63a409d03ba40d64c9
parent18081e30e1b76f3bd021b42e12e4a9f4f90554e8 (diff)
David McCreedy fixed libcurl to no longer ignore AUTH failures and now it
reacts properly according to the CURLOPT_FTP_SSL setting.
-rw-r--r--CHANGES3
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/ftp.c10
3 files changed, 13 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index a67e4d50a..f1222d423 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
Changelog
Daniel (20 March 2006)
+- David McCreedy fixed libcurl to no longer ignore AUTH failures and now it
+ reacts properly according to the CURLOPT_FTP_SSL setting.
+
- Dan Fandrich fixed two TFTP problems: Fixed a bug whereby a received file
whose length was a multiple of 512 bytes could have random garbage
appended. Also, stop processing TFTP packets which are too short to be
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 619ff8ce6..a7cb01f03 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,6 +15,7 @@ This release includes the following changes:
This release includes the following bugfixes:
+ o treat FTP AUTH failures properly
o TFTP transfers could trash data
o -d + -G combo crash
@@ -25,6 +26,6 @@ Other curl-related news since the previous public release:
This release would not have looked like this without help, code, reports and
advice from friends like these:
- Dan Fandrich, Ilja van Sprundel
+ Dan Fandrich, Ilja van Sprundel, David McCreedy
Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/ftp.c b/lib/ftp.c
index b53f8f309..86d37eafc 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -2430,8 +2430,14 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
result = Curl_nbftpsendf(conn, "AUTH %s", ftpauth[ftp->count1]);
/* remain in this same state */
}
- else
- result = ftp_state_user(conn);
+ else {
+ if(data->set.ftp_ssl > CURLFTPSSL_TRY)
+ /* we failed and CURLFTPSSL_CONTROL or CURLFTPSSL_ALL is set */
+ result = CURLE_FTP_SSL_FAILED;
+ else
+ /* ignore the failure and continue */
+ result = ftp_state_user(conn);
+ }
if(result)
return result;