[dovecot-cvs] dovecot/src/master login-process.c, 1.50, 1.51 master-settings.c, 1.42, 1.43 master-settings.h, 1.25, 1.26

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv31676/src/master

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



Index: login-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/login-process.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- login-process.c	19 Jan 2004 17:07:21 -0000	1.50
+++ login-process.c	10 May 2004 01:55:41 -0000	1.51
@@ -392,6 +392,10 @@
 				    set->ssl_key_file, NULL));
 		env_put(t_strconcat("SSL_PARAM_FILE=",
 				    set->ssl_parameters_file, NULL));
+		if (set->ssl_cipher_list != NULL) {
+			env_put(t_strconcat("SSL_CIPHER_LIST=",
+					    set->ssl_cipher_list, NULL));
+		}
 	}
 
 	if (set->disable_plaintext_auth)

Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- master-settings.c	10 May 2004 01:20:49 -0000	1.42
+++ master-settings.c	10 May 2004 01:55:41 -0000	1.43
@@ -51,6 +51,7 @@
 	DEF(SET_STR, ssl_key_file),
 	DEF(SET_STR, ssl_parameters_file),
 	DEF(SET_STR, ssl_parameters_regenerate),
+	DEF(SET_STR, ssl_cipher_list),
 	DEF(SET_BOOL, disable_plaintext_auth),
 	DEF(SET_BOOL, verbose_ssl),
 
@@ -172,6 +173,7 @@
 	MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem",
 	MEMBER(ssl_parameters_file) "ssl-parameters.dat",
 	MEMBER(ssl_parameters_regenerate) 24,
+	MEMBER(ssl_cipher_list) NULL,
 	MEMBER(disable_plaintext_auth) TRUE,
 	MEMBER(verbose_ssl) FALSE,
 

Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- master-settings.h	2 May 2004 20:33:52 -0000	1.25
+++ master-settings.h	10 May 2004 01:55:41 -0000	1.26
@@ -28,6 +28,7 @@
 	const char *ssl_key_file;
 	const char *ssl_parameters_file;
 	unsigned int ssl_parameters_regenerate;
+	const char *ssl_cipher_list;
 	int disable_plaintext_auth;
 	int verbose_ssl;