aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-08-11 08:39:48 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-08-11 08:39:48 +0000
commitdf59ca1a45edba80c4a56c856b46e9ac8eac22cc (patch)
tree722503dc70b40239f4b321c7e5a057cade3890df
parent9d84442409a283b9b0ce8b9db85523912530a9b2 (diff)
include the server response in the error message when an FTP server gives
back a 530 after the password is provided, as it isn't necessary because of a bad user name or password.
-rw-r--r--CHANGES9
-rw-r--r--lib/ftp.c7
2 files changed, 14 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 7c00812cf..f0d19f05a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,15 @@
Changelog
+Daniel (11 August 2004)
+- configure now defines _XOPEN_SOURCE to 500 on systems that need it to build
+ warning-free (the only known one so far is non-gcc builds on 64bit SGI
+ IRIX).
+
+- the FTP code now includes the server response in the error message when the
+ server gives back a 530 after the password is provided, as it isn't
+ necessary because of a bad user name or password.
+
Version 7.12.1 (10 August 2004)
Daniel (10 August 2004)
diff --git a/lib/ftp.c b/lib/ftp.c
index fb99243e7..67d6ddacb 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -592,8 +592,11 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
if(ftpcode == 530) {
/* 530 Login incorrect.
- (the username and/or the password are incorrect) */
- failf(data, "the username and/or the password are incorrect");
+ (the username and/or the password are incorrect)
+ or
+ 530 Sorry, the maximum number of allowed users are already connected
+ */
+ failf(data, "not logged in: %s", &buf[4]);
return CURLE_FTP_USER_PASSWORD_INCORRECT;
}
else if(ftpcode == 230) {