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

imap: Renamed state variables in imap_authenticate()

Browse Source 
Renamed the authstate1 and authstate2 variables in imap_authenticate()
as the old name was a left over from when there was only one state
variable which was named due to a clash with the state() function.

Additionally this provides consistency with the smtp module.
This commit is contained in:
Steve Holme
2013-02-08 21:40:54 +00:00
parent 40f9bb787f
commit 3bb45aa7f5
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/imap.c
View File

@@ -525,20 +525,20 @@ static CURLcode imap_authenticate(struct connectdata *conn)
const char *mech = NULL; const char *mech = NULL;
char *initresp = NULL; char *initresp = NULL;
size_t len = 0; size_t len = 0;
imapstate authstate1 = IMAP_STOP; imapstate state1 = IMAP_STOP;
imapstate authstate2 = IMAP_STOP; imapstate state2 = IMAP_STOP;
/* Calculate the supported authentication mechanism by decreasing order of /* Calculate the supported authentication mechanism by decreasing order of
security */ security */
#ifndef CURL_DISABLE_CRYPTO_AUTH #ifndef CURL_DISABLE_CRYPTO_AUTH
if(imapc->authmechs & SASL_MECH_DIGEST_MD5) { if(imapc->authmechs & SASL_MECH_DIGEST_MD5) {
mech = "DIGEST-MD5"; mech = "DIGEST-MD5";
authstate1 = IMAP_AUTHENTICATE_DIGESTMD5; state1 = IMAP_AUTHENTICATE_DIGESTMD5;
imapc->authused = SASL_MECH_DIGEST_MD5; imapc->authused = SASL_MECH_DIGEST_MD5;
} }
else if(imapc->authmechs & SASL_MECH_CRAM_MD5) { else if(imapc->authmechs & SASL_MECH_CRAM_MD5) {
mech = "CRAM-MD5"; mech = "CRAM-MD5";
authstate1 = IMAP_AUTHENTICATE_CRAMMD5; state1 = IMAP_AUTHENTICATE_CRAMMD5;
imapc->authused = SASL_MECH_CRAM_MD5; imapc->authused = SASL_MECH_CRAM_MD5;
} }
else else
@@ -546,8 +546,8 @@ static CURLcode imap_authenticate(struct connectdata *conn)
#ifdef USE_NTLM #ifdef USE_NTLM
if(imapc->authmechs & SASL_MECH_NTLM) { if(imapc->authmechs & SASL_MECH_NTLM) {
mech = "NTLM"; mech = "NTLM";
authstate1 = IMAP_AUTHENTICATE_NTLM; state1 = IMAP_AUTHENTICATE_NTLM;
authstate2 = IMAP_AUTHENTICATE_NTLM_TYPE2MSG; state2 = IMAP_AUTHENTICATE_NTLM_TYPE2MSG;
imapc->authused = SASL_MECH_NTLM; imapc->authused = SASL_MECH_NTLM;
if(imapc->ir_supported) if(imapc->ir_supported)
@@ -558,8 +558,8 @@ static CURLcode imap_authenticate(struct connectdata *conn)
#endif #endif
if(imapc->authmechs & SASL_MECH_LOGIN) { if(imapc->authmechs & SASL_MECH_LOGIN) {
mech = "LOGIN"; mech = "LOGIN";
authstate1 = IMAP_AUTHENTICATE_LOGIN; state1 = IMAP_AUTHENTICATE_LOGIN;
authstate2 = IMAP_AUTHENTICATE_LOGIN_PASSWD; state2 = IMAP_AUTHENTICATE_LOGIN_PASSWD;
imapc->authused = SASL_MECH_LOGIN; imapc->authused = SASL_MECH_LOGIN;
if(imapc->ir_supported) if(imapc->ir_supported)
@@ -568,8 +568,8 @@ static CURLcode imap_authenticate(struct connectdata *conn)
} }
else if(imapc->authmechs & SASL_MECH_PLAIN) { else if(imapc->authmechs & SASL_MECH_PLAIN) {
mech = "PLAIN"; mech = "PLAIN";
authstate1 = IMAP_AUTHENTICATE_PLAIN; state1 = IMAP_AUTHENTICATE_PLAIN;
authstate2 = IMAP_AUTHENTICATE; state2 = IMAP_AUTHENTICATE;
imapc->authused = SASL_MECH_PLAIN; imapc->authused = SASL_MECH_PLAIN;
if(imapc->ir_supported) if(imapc->ir_supported)
@@ -586,13 +586,13 @@ static CURLcode imap_authenticate(struct connectdata *conn)
result = imap_sendf(conn, "AUTHENTICATE %s %s", mech, initresp); result = imap_sendf(conn, "AUTHENTICATE %s %s", mech, initresp);
if(!result) if(!result)
state(conn, authstate2); state(conn, state2);
} }
else { else {
result = imap_sendf(conn, "AUTHENTICATE %s", mech); result = imap_sendf(conn, "AUTHENTICATE %s", mech);
if(!result) if(!result)
state(conn, authstate1); state(conn, state1);
} }
Curl_safefree(initresp); Curl_safefree(initresp);