Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 22696801 226968019827e07a9583b258aa8912990af847bc by Sergey Poznyakoff
Options

(tls_available,tls_done): Removed. 

(main): Call auth_gssapi_init, auth_gsasl_init
1 parent 09ca4f37
Inline Side-by-side
Showing 1 changed file with 4 additions and 10 deletions
...@@ -31,11 +31,6 @@ struct daemon_param daemon_param = { ...@@ -31,11 +31,6 @@ struct daemon_param daemon_param = {
31 0 /* No transcript by default */ 31 0 /* No transcript by default */
32 }; 32 };
33 33
34 #ifdef WITH_TLS
35 int tls_available;
36 int tls_done;
37 #endif /* WITH_TLS */
38
39 int login_disabled; 34 int login_disabled;
40 35
41 /* Number of child processes. */ 36 /* Number of child processes. */
...@@ -126,6 +121,9 @@ main (int argc, char **argv) ...@@ -126,6 +121,9 @@ main (int argc, char **argv)
126 MU_AUTH_REGISTER_ALL_MODULES (); 121 MU_AUTH_REGISTER_ALL_MODULES ();
127 imap4d_capability_init (); 122 imap4d_capability_init ();
128 123
124 auth_gssapi_init ();
125 auth_gsasl_init ();
126
129 #ifdef WITH_TLS 127 #ifdef WITH_TLS
130 mu_tls_init_argp (); 128 mu_tls_init_argp ();
131 #endif /* WITH_TLS */ 129 #endif /* WITH_TLS */
...@@ -199,11 +197,7 @@ main (int argc, char **argv) ...@@ -199,11 +197,7 @@ main (int argc, char **argv)
199 197
200 /* Check TLS environment, i.e. cert and key files */ 198 /* Check TLS environment, i.e. cert and key files */
201 #ifdef WITH_TLS 199 #ifdef WITH_TLS
202 tls_available = mu_check_tls_environment (); 200 starttls_init ();
203 if (tls_available)
204 tls_available = mu_init_tls_libs ();
205 if (tls_available)
206 imap4d_capability_add ("STARTTLS");
207 #endif /* WITH_TLS */ 201 #endif /* WITH_TLS */
208 202
209 /* Actually run the daemon. */ 203 /* Actually run the daemon. */
......