[dovecot-cvs] dovecot/src/master ssl-init.c,1.16,1.17

[cras at dovecot.org]

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

Modified Files:
	ssl-init.c 
Log Message:
If ssl_parameters_regenerate=0, don't regenerate it if it's otherwise ok.



Index: ssl-init.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/ssl-init.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ssl-init.c	15 Jan 2006 15:22:49 -0000	1.16
+++ ssl-init.c	15 Jan 2006 15:24:43 -0000	1.17
@@ -93,8 +93,8 @@
 
 	/* make sure it's new enough, it's not 0 sized, and the permissions
 	   are correct */
-	regen_time = st.st_mtime +
-		(time_t)(set->ssl_parameters_regenerate*3600);
+	regen_time = set->ssl_parameters_regenerate == 0 ? ioloop_time :
+		st.st_mtime + (time_t)(set->ssl_parameters_regenerate*3600);
 	if (regen_time < ioloop_time || st.st_size == 0 ||
 	    st.st_uid != master_uid || st.st_gid != getegid()) {
 		start_generate_process(set);