[dovecot-cvs] dovecot/src/master login-process.c,1.11,1.12 settings.c,1.21,1.22 settings.h,1.13,1.14

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv18167/src/master

Modified Files:
	login-process.c settings.c settings.h 
Log Message:
Added ssl_disable setting.



Index: login-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/login-process.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- login-process.c	20 Nov 2002 19:20:23 -0000	1.11
+++ login-process.c	25 Nov 2002 10:45:40 -0000	1.12
@@ -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));
 	}

Index: settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/settings.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- settings.c	24 Nov 2002 22:38:10 -0000	1.21
+++ settings.c	25 Nov 2002 10:45:40 -0000	1.22
@@ -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";

Index: settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/settings.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- settings.h	21 Nov 2002 20:31:03 -0000	1.13
+++ settings.h	25 Nov 2002 10:45:40 -0000	1.14
@@ -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;