Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 604fc0c2 604fc0c264a471776f3ea3befac2acfb845880e8 by Sergey Poznyakoff
Options

(imap4d_starttls): Clear tls_required upon 

successfull TLS handshake.
(starttls_init): Use IMAP_CAPA_STARTTLS instead of the
hardcoded literal.
1 parent b5563017
Inline Side-by-side
Showing 1 changed file with 7 additions and 3 deletions
...@@ -42,9 +42,13 @@ imap4d_starttls (struct imap4d_command *command, char *arg) ...@@ -42,9 +42,13 @@ imap4d_starttls (struct imap4d_command *command, char *arg)
42 42
43 if (tls_done) 43 if (tls_done)
44 { 44 {
45 imap4d_capability_remove ("STARTTLS"); 45 imap4d_capability_remove (IMAP_CAPA_STARTTLS);
46
46 login_disabled = 0; 47 login_disabled = 0;
47 imap4d_capability_remove ("LOGINDISABLED"); 48 imap4d_capability_remove (IMAP_CAPA_LOGINDISABLED);
49
50 tls_required = 0;
51 imap4d_capability_remove (IMAP_CAPA_XTLSREQUIRED);
48 } 52 }
49 else 53 else
50 { 54 {
...@@ -63,7 +67,7 @@ starttls_init () ...@@ -63,7 +67,7 @@ starttls_init ()
63 if (tls_available) 67 if (tls_available)
64 tls_available = mu_init_tls_libs (); 68 tls_available = mu_init_tls_libs ();
65 if (tls_available) 69 if (tls_available)
66 imap4d_capability_add ("STARTTLS"); 70 imap4d_capability_add (IMAP_CAPA_STARTTLS);
67 } 71 }
68 72
69 #endif /* WITH_TLS */ 73 #endif /* WITH_TLS */
......