Mercurial > dovecot > original-hg > dovecot-1.2
changeset 666:36ac2fd352ff HEAD
Added ssl_disable setting.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 25 Nov 2002 12:45:40 +0200 |
| parents | 748cbf0af0ed |
| children | aa33734bccd5 |
| files | dovecot-example.conf src/master/login-process.c src/master/settings.c src/master/settings.h |
| diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/dovecot-example.conf Mon Nov 25 12:35:27 2002 +0200 +++ b/dovecot-example.conf Mon Nov 25 12:45:40 2002 +0200 @@ -21,6 +21,9 @@ # to imap_listen if not specified. #imaps_listen = +# Disable SSL support. +#ssl_disable = no + # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before # dropping root privileges, so keep the key file unreadable by anyone but # root. Included doc/mkcert.sh can be used to easily generate self-signed
--- a/src/master/login-process.c Mon Nov 25 12:35:27 2002 +0200 +++ b/src/master/login-process.c Mon Nov 25 12:45:40 2002 +0200 @@ -302,17 +302,11 @@ } } - if (set_ssl_cert_file != NULL) { + if (!set_ssl_disable) { putenv((char *) t_strconcat("SSL_CERT_FILE=", set_ssl_cert_file, NULL)); - } - - if (set_ssl_key_file != NULL) { putenv((char *) t_strconcat("SSL_KEY_FILE=", set_ssl_key_file, NULL)); - } - - if (set_ssl_parameters_file != NULL) { putenv((char *) t_strconcat("SSL_PARAM_FILE=", set_ssl_parameters_file, NULL)); }
--- a/src/master/settings.c Mon Nov 25 12:35:27 2002 +0200 +++ b/src/master/settings.c Mon Nov 25 12:45:40 2002 +0200 @@ -30,6 +30,7 @@ { "imaps_port", SET_INT, &set_imaps_port }, { "imap_listen", SET_STR, &set_imap_listen }, { "imaps_listen", SET_STR, &set_imaps_listen }, + { "ssl_disable", SET_BOOL,&set_ssl_disable, }, { "ssl_cert_file", SET_STR, &set_ssl_cert_file }, { "ssl_key_file", SET_STR, &set_ssl_key_file }, { "ssl_parameters_file",SET_STR, &set_ssl_parameters_file }, @@ -89,6 +90,7 @@ char *set_imap_listen = NULL; char *set_imaps_listen = NULL; +int set_ssl_disable = FALSE; char *set_ssl_cert_file = SSLDIR"/certs/imapd.pem"; char *set_ssl_key_file = SSLDIR"/private/imapd.pem"; char *set_ssl_parameters_file = PKG_RUNDIR"/ssl-parameters.dat";
--- a/src/master/settings.h Mon Nov 25 12:35:27 2002 +0200 +++ b/src/master/settings.h Mon Nov 25 12:45:40 2002 +0200 @@ -11,6 +11,7 @@ extern char *set_imap_listen; extern char *set_imaps_listen; +extern int set_ssl_disable; extern char *set_ssl_cert_file; extern char *set_ssl_key_file; extern char *set_ssl_parameters_file;