mirror of https://github.com/moparisthebest/curl
CURLE_FTP_USER_PASSWORD_INCORRECT is not returned by libcurl anymore!
This commit is contained in:
parent
260b88c197
commit
a21a77d230
|
@ -30,7 +30,7 @@ or problem.
|
||||||
.IP "CURLE_URL_MALFORMAT (3)"
|
.IP "CURLE_URL_MALFORMAT (3)"
|
||||||
The URL was not properly formatted.
|
The URL was not properly formatted.
|
||||||
.IP "CURLE_URL_MALFORMAT_USER (4)"
|
.IP "CURLE_URL_MALFORMAT_USER (4)"
|
||||||
URL user malformatted. The user-part of the URL syntax was not correct.
|
This is never returned by current libcurl.
|
||||||
.IP "CURLE_COULDNT_RESOLVE_PROXY (5)"
|
.IP "CURLE_COULDNT_RESOLVE_PROXY (5)"
|
||||||
Couldn't resolve proxy. The given proxy host could not be resolved.
|
Couldn't resolve proxy. The given proxy host could not be resolved.
|
||||||
.IP "CURLE_COULDNT_RESOLVE_HOST (6)"
|
.IP "CURLE_COULDNT_RESOLVE_HOST (6)"
|
||||||
|
@ -45,9 +45,7 @@ remote server is probably not an OK FTP server.
|
||||||
We were denied access when trying to login to an FTP server or when trying to
|
We were denied access when trying to login to an FTP server or when trying to
|
||||||
change working directory to the one given in the URL.
|
change working directory to the one given in the URL.
|
||||||
.IP "CURLE_FTP_USER_PASSWORD_INCORRECT (10)"
|
.IP "CURLE_FTP_USER_PASSWORD_INCORRECT (10)"
|
||||||
The FTP server rejected access to the server after the password was sent to
|
This is never returned by current libcurl.
|
||||||
it. It might be because the username and/or the password were incorrect or
|
|
||||||
just that the server is not allowing you access for the moment etc.
|
|
||||||
.IP "CURLE_FTP_WEIRD_PASS_REPLY (11)"
|
.IP "CURLE_FTP_WEIRD_PASS_REPLY (11)"
|
||||||
After having sent the FTP password to the server, libcurl expects a proper
|
After having sent the FTP password to the server, libcurl expects a proper
|
||||||
reply. This error code indicates that an unexpected code was returned.
|
reply. This error code indicates that an unexpected code was returned.
|
||||||
|
@ -87,7 +85,7 @@ returns an error code that is >= 400.
|
||||||
An error occurred when writing received data to a local file, or an error was
|
An error occurred when writing received data to a local file, or an error was
|
||||||
returned to libcurl from a write callback.
|
returned to libcurl from a write callback.
|
||||||
.IP "CURLE_MALFORMAT_USER (24)"
|
.IP "CURLE_MALFORMAT_USER (24)"
|
||||||
Malformat user. User name badly specified. *Not currently used*
|
This is never returned by current libcurl.
|
||||||
.IP "CURLE_FTP_COULDNT_STOR_FILE (25)"
|
.IP "CURLE_FTP_COULDNT_STOR_FILE (25)"
|
||||||
FTP couldn't STOR file. The server denied the STOR operation. The error buffer
|
FTP couldn't STOR file. The server denied the STOR operation. The error buffer
|
||||||
usually contains the server's explanation to this.
|
usually contains the server's explanation to this.
|
||||||
|
@ -138,15 +136,13 @@ Aborted by callback. A callback returned "abort" to libcurl.
|
||||||
.IP "CURLE_BAD_FUNCTION_ARGUMENT (43)"
|
.IP "CURLE_BAD_FUNCTION_ARGUMENT (43)"
|
||||||
Internal error. A function was called with a bad parameter.
|
Internal error. A function was called with a bad parameter.
|
||||||
.IP "CURLE_BAD_CALLING_ORDER (44)"
|
.IP "CURLE_BAD_CALLING_ORDER (44)"
|
||||||
Internal error. A function was called in a bad order.
|
This is never returned by current libcurl.
|
||||||
.IP "CURLE_HTTP_PORT_FAILED (45)"
|
.IP "CURLE_HTTP_PORT_FAILED (45)"
|
||||||
Interface error. A specified outgoing interface could not be used. Set which
|
Interface error. A specified outgoing interface could not be used. Set which
|
||||||
interface to use for outgoing connections' source IP address with
|
interface to use for outgoing connections' source IP address with
|
||||||
CURLOPT_INTERFACE.
|
CURLOPT_INTERFACE.
|
||||||
.IP "CURLE_BAD_PASSWORD_ENTERED (46)"
|
.IP "CURLE_BAD_PASSWORD_ENTERED (46)"
|
||||||
Bad password entered. An error was signaled when the password was
|
This is never returned by current libcurl.
|
||||||
entered. This can also be the result of a "bad password" returned from a
|
|
||||||
specified password callback.
|
|
||||||
.IP "CURLE_TOO_MANY_REDIRECTS (47)"
|
.IP "CURLE_TOO_MANY_REDIRECTS (47)"
|
||||||
Too many redirects. When following redirects, libcurl hit the maximum amount.
|
Too many redirects. When following redirects, libcurl hit the maximum amount.
|
||||||
Set your limit with CURLOPT_MAXREDIRS.
|
Set your limit with CURLOPT_MAXREDIRS.
|
||||||
|
|
|
@ -242,7 +242,7 @@ typedef enum {
|
||||||
CURLE_UNSUPPORTED_PROTOCOL, /* 1 */
|
CURLE_UNSUPPORTED_PROTOCOL, /* 1 */
|
||||||
CURLE_FAILED_INIT, /* 2 */
|
CURLE_FAILED_INIT, /* 2 */
|
||||||
CURLE_URL_MALFORMAT, /* 3 */
|
CURLE_URL_MALFORMAT, /* 3 */
|
||||||
CURLE_URL_MALFORMAT_USER, /* 4 (NOT USED) */
|
CURLE_URL_MALFORMAT_USER, /* 4 - NOT USED */
|
||||||
CURLE_COULDNT_RESOLVE_PROXY, /* 5 */
|
CURLE_COULDNT_RESOLVE_PROXY, /* 5 */
|
||||||
CURLE_COULDNT_RESOLVE_HOST, /* 6 */
|
CURLE_COULDNT_RESOLVE_HOST, /* 6 */
|
||||||
CURLE_COULDNT_CONNECT, /* 7 */
|
CURLE_COULDNT_CONNECT, /* 7 */
|
||||||
|
@ -250,7 +250,7 @@ typedef enum {
|
||||||
CURLE_FTP_ACCESS_DENIED, /* 9 a service was denied by the FTP server
|
CURLE_FTP_ACCESS_DENIED, /* 9 a service was denied by the FTP server
|
||||||
due to lack of access - when login fails
|
due to lack of access - when login fails
|
||||||
this is not returned. */
|
this is not returned. */
|
||||||
CURLE_FTP_USER_PASSWORD_INCORRECT, /* 10 */
|
CURLE_FTP_USER_PASSWORD_INCORRECT, /* 10 - NOT USED */
|
||||||
CURLE_FTP_WEIRD_PASS_REPLY, /* 11 */
|
CURLE_FTP_WEIRD_PASS_REPLY, /* 11 */
|
||||||
CURLE_FTP_WEIRD_USER_REPLY, /* 12 */
|
CURLE_FTP_WEIRD_USER_REPLY, /* 12 */
|
||||||
CURLE_FTP_WEIRD_PASV_REPLY, /* 13 */
|
CURLE_FTP_WEIRD_PASV_REPLY, /* 13 */
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
* | (__| |_| | _ <| |___
|
* | (__| |_| | _ <| |___
|
||||||
* \___|\___/|_| \_\_____|
|
* \___|\___/|_| \_\_____|
|
||||||
*
|
*
|
||||||
* Copyright (C) 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
|
* Copyright (C) 2004, 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||||
*
|
*
|
||||||
* This software is licensed as described in the file COPYING, which
|
* This software is licensed as described in the file COPYING, which
|
||||||
* you should have received as part of this distribution. The terms
|
* you should have received as part of this distribution. The terms
|
||||||
|
@ -83,9 +83,6 @@ curl_easy_strerror(CURLcode error)
|
||||||
case CURLE_FTP_ACCESS_DENIED:
|
case CURLE_FTP_ACCESS_DENIED:
|
||||||
return "FTP: access denied";
|
return "FTP: access denied";
|
||||||
|
|
||||||
case CURLE_FTP_USER_PASSWORD_INCORRECT:
|
|
||||||
return "FTP: user and/or password incorrect";
|
|
||||||
|
|
||||||
case CURLE_FTP_WEIRD_PASS_REPLY:
|
case CURLE_FTP_WEIRD_PASS_REPLY:
|
||||||
return "FTP: unknown PASS reply";
|
return "FTP: unknown PASS reply";
|
||||||
|
|
||||||
|
@ -276,11 +273,13 @@ curl_easy_strerror(CURLcode error)
|
||||||
case CURLE_CONV_REQD:
|
case CURLE_CONV_REQD:
|
||||||
return "caller must register CURLOPT_CONV_ callback options";
|
return "caller must register CURLOPT_CONV_ callback options";
|
||||||
|
|
||||||
case CURLE_URL_MALFORMAT_USER: /* not used by current libcurl */
|
/* error codes not used by current libcurl */
|
||||||
case CURLE_MALFORMAT_USER: /* not used by current libcurl */
|
case CURLE_URL_MALFORMAT_USER:
|
||||||
case CURLE_BAD_CALLING_ORDER: /* not used by current libcurl */
|
case CURLE_FTP_USER_PASSWORD_INCORRECT:
|
||||||
case CURLE_BAD_PASSWORD_ENTERED:/* not used by current libcurl */
|
case CURLE_MALFORMAT_USER:
|
||||||
case CURLE_OBSOLETE: /* not used by current libcurl */
|
case CURLE_BAD_CALLING_ORDER:
|
||||||
|
case CURLE_BAD_PASSWORD_ENTERED:
|
||||||
|
case CURLE_OBSOLETE:
|
||||||
case CURL_LAST:
|
case CURL_LAST:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4162,8 +4162,7 @@ operate(struct Configurable *config, int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} /* if CURLE_OK */
|
} /* if CURLE_OK */
|
||||||
else if((CURLE_FTP_USER_PASSWORD_INCORRECT == res) ||
|
else if(CURLE_LOGIN_DENIED == res) {
|
||||||
(CURLE_LOGIN_DENIED == res)) {
|
|
||||||
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response);
|
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response);
|
||||||
|
|
||||||
if(response/100 == 5)
|
if(response/100 == 5)
|
||||||
|
|
Loading…
Reference in New Issue