diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2013-02-27 21:19:48 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2013-02-27 21:19:48 +0000 |
| commit | 13006f3de9ec017ff27b50b82f9cf02abdcf22e5 (patch) | |
| tree | f6122926aa082db6ba489ffdb68d00a2a4de1f97 | |
| parent | 1d86d813c3dc246b16fdf7242862e17594d9ef5e (diff) | |
imap: Re-factored final IMAP_AUTHENTICATE constant
Changed the final IMAP_AUTHENTICATE constant to IMAP_AUTHENTICATE_FINAL
for consistency with the response function.
| -rw-r--r-- | lib/imap.c | 16 | ||||
| -rw-r--r-- | lib/imap.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/imap.c b/lib/imap.c index 27c6a0565..78e3f0409 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -427,7 +427,7 @@ static bool imap_endofresp(struct connectdata *conn, char *line, size_t len, case IMAP_AUTHENTICATE_DIGESTMD5_RESP: case IMAP_AUTHENTICATE_NTLM: case IMAP_AUTHENTICATE_NTLM_TYPE2MSG: - case IMAP_AUTHENTICATE: + case IMAP_AUTHENTICATE_FINAL: *resp = '+'; break; @@ -625,7 +625,7 @@ static CURLcode imap_authenticate(struct connectdata *conn) else if(imapc->authmechs & SASL_MECH_PLAIN) { mech = "PLAIN"; state1 = IMAP_AUTHENTICATE_PLAIN; - state2 = IMAP_AUTHENTICATE; + state2 = IMAP_AUTHENTICATE_FINAL; imapc->authused = SASL_MECH_PLAIN; if(imapc->ir_supported) @@ -884,7 +884,7 @@ static CURLcode imap_state_auth_plain_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.imapc.pp, "%s", plainauth); if(!result) - state(conn, IMAP_AUTHENTICATE); + state(conn, IMAP_AUTHENTICATE_FINAL); } Curl_safefree(plainauth); @@ -958,7 +958,7 @@ static CURLcode imap_state_auth_login_password_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.imapc.pp, "%s", authpasswd); if(!result) - state(conn, IMAP_AUTHENTICATE); + state(conn, IMAP_AUTHENTICATE_FINAL); } Curl_safefree(authpasswd); @@ -1013,7 +1013,7 @@ static CURLcode imap_state_auth_cram_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.imapc.pp, "%s", rplyb64); if(!result) - state(conn, IMAP_AUTHENTICATE); + state(conn, IMAP_AUTHENTICATE_FINAL); } Curl_safefree(rplyb64); @@ -1083,7 +1083,7 @@ static CURLcode imap_state_auth_digest_resp_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.imapc.pp, ""); if(!result) - state(conn, IMAP_AUTHENTICATE); + state(conn, IMAP_AUTHENTICATE_FINAL); } return result; @@ -1159,7 +1159,7 @@ static CURLcode imap_state_auth_ntlm_type2msg_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.imapc.pp, "%s", type3msg); if(!result) - state(conn, IMAP_AUTHENTICATE); + state(conn, IMAP_AUTHENTICATE_FINAL); } Curl_safefree(type3msg); @@ -1418,7 +1418,7 @@ static CURLcode imap_statemach_act(struct connectdata *conn) break; #endif - case IMAP_AUTHENTICATE: + case IMAP_AUTHENTICATE_FINAL: result = imap_state_auth_final_resp(conn, imapcode, imapc->state); break; diff --git a/lib/imap.h b/lib/imap.h index f9bae2e85..428bc23ae 100644 --- a/lib/imap.h +++ b/lib/imap.h @@ -43,7 +43,7 @@ typedef enum { IMAP_AUTHENTICATE_DIGESTMD5_RESP, IMAP_AUTHENTICATE_NTLM, IMAP_AUTHENTICATE_NTLM_TYPE2MSG, - IMAP_AUTHENTICATE, + IMAP_AUTHENTICATE_FINAL, IMAP_LOGIN, IMAP_SELECT, IMAP_FETCH, |