Commit aa44ec62 authored by Steve Holme's avatar Steve Holme
Browse files

email: Slight reordering of connection based variables 

Reordered the state and ssl_done variables in order to provide more
consistency between the email protocols as well as for for an upcoming
change.
parent 05c03e7e

lib/imap.h

+2 −2
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ struct IMAP { 
   struct */

struct imap_conn {

  struct pingpong pp;

  imapstate state;            /* Always use imap.c:state() to change state! */

  bool ssldone;               /* Is connect() over SSL done? */

  unsigned int authmechs;     /* Accepted authentication mechanisms */

  unsigned int authused;      /* Auth mechanism used for the connection */

  imapstate state;            /* Always use imap.c:state() to change state! */

  int cmdid;                  /* Last used command ID */

  char resptag[5];            /* Response tag to wait for */

  bool ssldone;               /* Is connect() over SSL done? */

  bool tls_supported;         /* StartTLS capability supported by server */

  bool login_disabled;        /* LOGIN command disabled by server */

  bool ir_supported;          /* Initial response supported by server */

lib/pop3.h

+2 −2
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ struct POP3 { 
   struct */

struct pop3_conn {

  struct pingpong pp;

  pop3state state;        /* Always use pop3.c:state() to change state! */

  bool ssldone;           /* Is connect() over SSL done? */

  size_t eob;             /* Number of bytes of the EOB (End Of Body) that

                             have been received so far */

  size_t strip;           /* Number of bytes from the start to ignore as
@@ -74,8 +76,6 @@ struct pop3_conn { 
  unsigned int authmechs; /* Accepted SASL authentication mechanisms */

  unsigned int authused;  /* SASL auth mechanism used for the connection */

  char *apoptimestamp;    /* APOP timestamp from the server greeting */

  pop3state state;        /* Always use pop3.c:state() to change state! */

  bool ssldone;           /* Is connect() over SSL done? */

  bool tls_supported;     /* StartTLS capability supported by server */

};

lib/smtp.h

+2 −2
Original line number Diff line number Diff line
@@ -66,13 +66,13 @@ struct SMTP { 
   struct */

struct smtp_conn {

  struct pingpong pp;

  smtpstate state;         /* Always use smtp.c:state() to change state! */

  bool ssldone;            /* Is connect() over SSL done? */

  char *domain;            /* Client address/name to send in the EHLO */

  size_t eob;              /* Number of bytes of the EOB (End Of Body) that

                              have been received so far */

  unsigned int authmechs;  /* Accepted authentication mechanisms */

  unsigned int authused;   /* Auth mechanism used for the connection */

  smtpstate state;         /* Always use smtp.c:state() to change state! */

  bool ssldone;            /* Is connect() over SSL done? */

  bool tls_supported;      /* StartTLS capability supported by server */

  bool size_supported;     /* If server supports SIZE extension according to

                              RFC 1870 */