[Fedora-directory-commits] mod_nss nss_engine_init.c,1.21,1.22

[Doctor Conrad]

Author: rcritten

Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31536

Modified Files:
	nss_engine_init.c 
Log Message:
200855

Turns out I didn't need to defer startup at all, the LogLevel in nss.conf
was enough. I actually had the compare reversed anyway, but that was
the least of the problem. 30% of the time the server would core during
shutdown due to a race condition.



Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nss_engine_init.c	2 Aug 2006 15:14:47 -0000	1.21
+++ nss_engine_init.c	2 Aug 2006 18:59:12 -0000	1.22
@@ -969,9 +969,7 @@
 
     nss_init_ctx(s, p, ptemp, sc->proxy);
 
-    /* Only try to load the certificates once the server is up */
-    if (mc->nInitCount < 2)
-        nss_init_server_certs(s, p, ptemp, sc->proxy);
+    nss_init_server_certs(s, p, ptemp, sc->proxy);
 }
 
 static void nss_init_server_ctx(server_rec *s,
@@ -985,9 +983,7 @@
 
     nss_init_ctx(s, p, ptemp, sc->server);
 
-    /* Only try to load the certificates once the server is up */
-    if (mc->nInitCount < 2)
-        nss_init_server_certs(s, p, ptemp, sc->server);
+    nss_init_server_certs(s, p, ptemp, sc->server);
 }
 
 /*