Commit 85a2e9ec authored by Steve Holme's avatar Steve Holme
Browse files

email: Post STARTLS capability code tidy up (Part One) 

Corrected the order of the CAPA / CAPABILITY state machine constants to
match the execution order.
parent 18d1ea45

lib/imap.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

lib/imap.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

lib/pop3.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

lib/pop3.h

+1 −1
Original line number Diff line number Diff line
@@ -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,