changeset 3894:f777ef3a79ca HEAD

If ssl_parameters_regenerate=0, don't regenerate it if it's otherwise ok.
author Timo Sirainen <tss@iki.fi>
date Sun, 15 Jan 2006 17:24:43 +0200
parents 1a036356a752
children 5c047d58a67d
files src/master/ssl-init.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/ssl-init.c	Sun Jan 15 17:22:49 2006 +0200
+++ b/src/master/ssl-init.c	Sun Jan 15 17:24:43 2006 +0200
@@ -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);