From df59ca1a45edba80c4a56c856b46e9ac8eac22cc Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 11 Aug 2004 08:39:48 +0000 Subject: 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. --- CHANGES | 9 +++++++++ lib/ftp.c | 7 +++++-- 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) { -- cgit v1.2.3