generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

security.c: Fix Curl_sec_login after rewrite.

Browse Source 
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:
Julien Chaffraix
2010-09-26 19:14:50 -07:00
parent bfbc4c7e00
commit fc9f369829
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ftp.c
View File

@@ -2424,7 +2424,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
set a valid level */ set a valid level */
Curl_sec_request_prot(conn, data->set.str[STRING_KRB_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"); infof(data, "Logging in with password in cleartext!\n");
else else
infof(data, "Authentication successful\n"); infof(data, "Authentication successful\n");

2
lib/krb4.h
View File

@@ -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); int Curl_sec_vfprintf2(struct connectdata *conn, FILE *, const char *, va_list);
void Curl_sec_end (struct connectdata *); void Curl_sec_end (struct connectdata *);
int Curl_sec_login (struct connectdata *); CURLcode Curl_sec_login (struct connectdata *);
void Curl_sec_prot (int, char **); void Curl_sec_prot (int, char **);
int Curl_sec_request_prot (struct connectdata *conn, const char *level); int Curl_sec_request_prot (struct connectdata *conn, const char *level);
int Curl_sec_set_protection_level(struct connectdata *conn); int Curl_sec_set_protection_level(struct connectdata *conn);

5
lib/security.c
View File

@@ -566,11 +566,10 @@ static CURLcode choose_mech(struct connectdata *conn)
return mech != NULL ? CURLE_OK : CURLE_FAILED_INIT; return mech != NULL ? CURLE_OK : CURLE_FAILED_INIT;
} }
int CURLcode
Curl_sec_login(struct connectdata *conn) Curl_sec_login(struct connectdata *conn)
{ {
CURLcode code = choose_mech(conn); return choose_mech(conn);
return code == CURLE_OK;
} }