diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2013-02-10 21:18:30 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2013-02-10 21:18:30 +0000 |
| commit | 85a2e9ec820a8d904d4733f1d84007e806409e10 (patch) | |
| tree | eadba81596a84716fcae2c674a09f671193a6a51 | |
| parent | 18d1ea45282508825b74ebf6704db812797e553a (diff) | |
email: Post STARTLS capability code tidy up (Part One)
Corrected the order of the CAPA / CAPABILITY state machine constants to
match the execution order.
| -rw-r--r-- | lib/imap.c | 10 | ||||
| -rw-r--r-- | lib/imap.h | 2 | ||||
| -rw-r--r-- | lib/pop3.c | 10 | ||||
| -rw-r--r-- | lib/pop3.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/lib/imap.c b/lib/imap.c index be0de2eed..5ef2e0f66 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -433,9 +433,9 @@ static void state(struct connectdata *conn, imapstate newstate) static const char * const names[]={ "STOP", "SERVERGREET", + "CAPABILITY", "STARTTLS", "UPGRADETLS", - "CAPABILITY", "AUTHENTICATE_PLAIN", "AUTHENTICATE_LOGIN", "AUTHENTICATE_LOGIN_PASSWD", @@ -1265,14 +1265,14 @@ static CURLcode imap_statemach_act(struct connectdata *conn) result = imap_state_servergreet_resp(conn, imapcode, imapc->state); break; - case IMAP_STARTTLS: - result = imap_state_starttls_resp(conn, imapcode, imapc->state); - break; - case IMAP_CAPABILITY: result = imap_state_capability_resp(conn, imapcode, imapc->state); break; + case IMAP_STARTTLS: + result = imap_state_starttls_resp(conn, imapcode, imapc->state); + break; + case IMAP_AUTHENTICATE_PLAIN: result = imap_state_auth_plain_resp(conn, imapcode, imapc->state); break; diff --git a/lib/imap.h b/lib/imap.h index a8164c084..31888529a 100644 --- a/lib/imap.h +++ b/lib/imap.h @@ -31,10 +31,10 @@ typedef enum { IMAP_STOP, /* do nothing state, stops the state machine */ IMAP_SERVERGREET, /* waiting for the initial greeting immediately after a connect */ + IMAP_CAPABILITY, IMAP_STARTTLS, IMAP_UPGRADETLS, /* asynchronously upgrade the connection to SSL/TLS (multi mode only) */ - IMAP_CAPABILITY, IMAP_AUTHENTICATE_PLAIN, IMAP_AUTHENTICATE_LOGIN, IMAP_AUTHENTICATE_LOGIN_PASSWD, diff --git a/lib/pop3.c b/lib/pop3.c index 2b58df9b5..3e541fa86 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -345,9 +345,9 @@ static void state(struct connectdata *conn, pop3state newstate) static const char * const names[] = { "STOP", "SERVERGREET", + "CAPA", "STARTTLS", "UPGRADETLS", - "CAPA", "AUTH_PLAIN", "AUTH_LOGIN", "AUTH_LOGIN_PASSWD", @@ -1185,14 +1185,14 @@ static CURLcode pop3_statemach_act(struct connectdata *conn) result = pop3_state_servergreet_resp(conn, pop3code, pop3c->state); break; - case POP3_STARTTLS: - result = pop3_state_starttls_resp(conn, pop3code, pop3c->state); - break; - case POP3_CAPA: result = pop3_state_capa_resp(conn, pop3code, pop3c->state); break; + case POP3_STARTTLS: + result = pop3_state_starttls_resp(conn, pop3code, pop3c->state); + break; + case POP3_AUTH_PLAIN: result = pop3_state_auth_plain_resp(conn, pop3code, pop3c->state); break; diff --git a/lib/pop3.h b/lib/pop3.h index c37b009dd..6ef408e49 100644 --- a/lib/pop3.h +++ b/lib/pop3.h @@ -29,10 +29,10 @@ typedef enum { POP3_STOP, /* do nothing state, stops the state machine */ POP3_SERVERGREET, /* waiting for the initial greeting immediately after a connect */ + POP3_CAPA, POP3_STARTTLS, POP3_UPGRADETLS, /* asynchronously upgrade the connection to SSL/TLS (multi mode only) */ - POP3_CAPA, POP3_AUTH_PLAIN, POP3_AUTH_LOGIN, POP3_AUTH_LOGIN_PASSWD, |