[dovecot-cvs] dovecot/src/master auth-process.c, 1.81, 1.82 master-settings.c, 1.89, 1.90 master-settings.h, 1.59, 1.60

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv23762/src/master

Modified Files:
	auth-process.c master-settings.c master-settings.h 
Log Message:
Added ssl_username_from_cert setting. Not actually tested yet..



Index: auth-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- auth-process.c	24 Sep 2005 12:55:23 -0000	1.81
+++ auth-process.c	1 Oct 2005 10:52:16 -0000	1.82
@@ -456,6 +456,8 @@
 		env_put("VERBOSE_DEBUG=1");
 	if (set->ssl_require_client_cert)
 		env_put("SSL_REQUIRE_CLIENT_CERT=1");
+	if (set->ssl_username_from_cert)
+		env_put("SSL_USERNAME_FROM_CERT=1");
 
 	restrict_process_size(set->process_size, (unsigned int)-1);
 }

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- master-settings.c	24 Sep 2005 12:55:23 -0000	1.89
+++ master-settings.c	1 Oct 2005 10:52:16 -0000	1.90
@@ -159,6 +159,7 @@
 	DEF(SET_BOOL, verbose),
 	DEF(SET_BOOL, debug),
 	DEF(SET_BOOL, ssl_require_client_cert),
+	DEF(SET_BOOL, ssl_username_from_cert),
 
 	DEF(SET_INT, count),
 	DEF(SET_INT, worker_max_count),
@@ -356,6 +357,7 @@
 	MEMBER(verbose) FALSE,
 	MEMBER(debug) FALSE,
 	MEMBER(ssl_require_client_cert) FALSE,
+	MEMBER(ssl_username_from_cert) FALSE,
 
 	MEMBER(count) 1,
 	MEMBER(worker_max_count) 30,
@@ -433,7 +435,7 @@
 		return FALSE;
 	}
 
-	if (auth->ssl_require_client_cert) {
+	if (auth->ssl_require_client_cert || auth->ssl_username_from_cert) {
 		/* if we require valid cert, make sure we also ask for it */
 		if (auth->parent->pop3 != NULL)
 			auth->parent->pop3->ssl_verify_client_cert = TRUE;

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- master-settings.h	24 Sep 2005 12:55:23 -0000	1.59
+++ master-settings.h	1 Oct 2005 10:52:16 -0000	1.60
@@ -165,6 +165,7 @@
 
 	int verbose, debug;
 	int ssl_require_client_cert;
+	int ssl_username_from_cert;
 
 	unsigned int count;
 	unsigned int worker_max_count;