mirror of
https://github.com/curl/curl.git
synced 2025-02-17 14:59:45 +08:00
security.c: Fix Curl_sec_login after rewrite.
Curl_sec_login was returning the opposite result that the code in ftp.c was expecting. Simplified the return code (using a CURLcode) so to see more clearly what is going on.
This commit is contained in:
parent
bfbc4c7e00
commit
fc9f369829
@ -2424,7 +2424,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
|
||||
set a valid level */
|
||||
Curl_sec_request_prot(conn, data->set.str[STRING_KRB_LEVEL]);
|
||||
|
||||
if(Curl_sec_login(conn) != 0)
|
||||
if(Curl_sec_login(conn) != CURLE_OK)
|
||||
infof(data, "Logging in with password in cleartext!\n");
|
||||
else
|
||||
infof(data, "Authentication successful\n");
|
||||
|
@ -58,7 +58,7 @@ int Curl_sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...);
|
||||
int Curl_sec_vfprintf2(struct connectdata *conn, FILE *, const char *, va_list);
|
||||
|
||||
void Curl_sec_end (struct connectdata *);
|
||||
int Curl_sec_login (struct connectdata *);
|
||||
CURLcode Curl_sec_login (struct connectdata *);
|
||||
void Curl_sec_prot (int, char **);
|
||||
int Curl_sec_request_prot (struct connectdata *conn, const char *level);
|
||||
int Curl_sec_set_protection_level(struct connectdata *conn);
|
||||
|
@ -566,11 +566,10 @@ static CURLcode choose_mech(struct connectdata *conn)
|
||||
return mech != NULL ? CURLE_OK : CURLE_FAILED_INIT;
|
||||
}
|
||||
|
||||
int
|
||||
CURLcode
|
||||
Curl_sec_login(struct connectdata *conn)
|
||||
{
|
||||
CURLcode code = choose_mech(conn);
|
||||
return code == CURLE_OK;
|
||||
return choose_mech(conn);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user