diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2013-02-07 20:37:11 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2013-02-07 20:37:11 +0000 |
| commit | e07385f85318b01f9d3a3a752436742e83f3e953 (patch) | |
| tree | ea2b36317de28fb6f2940f1f17cf279794b00e65 | |
| parent | 86dfcf737d1b05c7c731f098ff8c0e0ab87040fa (diff) | |
smtp: Updated SMTP_AUTH_PASSWD state constant
Changed the SMTP_AUTH_PASSWD state constant to SMTP_AUTH_LOGIN_PASSWD to
better describe the state as the second part of an AUTH LOGIN command,
as well as for consistency with the imap and pop3 modules.
| -rw-r--r-- | lib/smtp.c | 10 | ||||
| -rw-r--r-- | lib/smtp.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index 26b2bd0dd..bb1df5606 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -293,7 +293,7 @@ static void state(struct connectdata *conn, smtpstate newstate) "UPGRADETLS", "AUTH_PLAIN", "AUTH_LOGIN", - "AUTH_PASSWD", + "AUTH_LOGIN_PASSWD", "AUTH_CRAMMD5", "AUTH_DIGESTMD5", "AUTH_DIGESTMD5_RESP", @@ -416,7 +416,7 @@ static CURLcode smtp_authenticate(struct connectdata *conn) if(smtpc->authmechs & SASL_MECH_LOGIN) { mech = "LOGIN"; state1 = SMTP_AUTH_LOGIN; - state2 = SMTP_AUTH_PASSWD; + state2 = SMTP_AUTH_LOGIN_PASSWD; smtpc->authused = SASL_MECH_LOGIN; result = Curl_sasl_create_login_message(conn->data, conn->user, &initresp, &len); @@ -650,7 +650,7 @@ static CURLcode smtp_state_auth_login_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", authuser); if(!result) - state(conn, SMTP_AUTH_PASSWD); + state(conn, SMTP_AUTH_LOGIN_PASSWD); } Curl_safefree(authuser); @@ -660,7 +660,7 @@ static CURLcode smtp_state_auth_login_resp(struct connectdata *conn, return result; } -/* For responses to user entry of AUTH LOGIN */ +/* For AUTH LOGIN user entry responses */ static CURLcode smtp_state_auth_passwd_resp(struct connectdata *conn, int smtpcode, smtpstate instate) @@ -1173,7 +1173,7 @@ static CURLcode smtp_statemach_act(struct connectdata *conn) result = smtp_state_auth_login_resp(conn, smtpcode, smtpc->state); break; - case SMTP_AUTH_PASSWD: + case SMTP_AUTH_LOGIN_PASSWD: result = smtp_state_auth_passwd_resp(conn, smtpcode, smtpc->state); break; diff --git a/lib/smtp.h b/lib/smtp.h index d926795f5..cb3ef5854 100644 --- a/lib/smtp.h +++ b/lib/smtp.h @@ -38,7 +38,7 @@ typedef enum { (multi mode only) */ SMTP_AUTH_PLAIN, SMTP_AUTH_LOGIN, - SMTP_AUTH_PASSWD, + SMTP_AUTH_LOGIN_PASSWD, SMTP_AUTH_CRAMMD5, SMTP_AUTH_DIGESTMD5, SMTP_AUTH_DIGESTMD5_RESP, |