diff options
| -rw-r--r-- | lib/imap.h | 4 | ||||
| -rw-r--r-- | lib/pop3.h | 4 | ||||
| -rw-r--r-- | lib/smtp.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/imap.h b/lib/imap.h index e6ede9777..aafa63417 100644 --- a/lib/imap.h +++ b/lib/imap.h @@ -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 */ diff --git a/lib/pop3.h b/lib/pop3.h index 4277535ae..335e67d77 100644 --- a/lib/pop3.h +++ b/lib/pop3.h @@ -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 */ }; diff --git a/lib/smtp.h b/lib/smtp.h index 76a8525a9..837ab0828 100644 --- a/lib/smtp.h +++ b/lib/smtp.h @@ -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 */ |