[Fedora-directory-commits] ldapserver/ldap/servers/slapd ssl.c, 1.15, 1.16

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13543

Modified Files:
	ssl.c 
Log Message:
Resolves: bug 336881
Bug Description: qualify warning message when cert8.db is missing
Reviewed by: self
Fix Description: Only warn when both cert8.db and cert7.db are missing.  If cert7.db is there, NSS will automatically create cert8.db from it.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: ssl.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ssl.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ssl.c	18 Oct 2007 00:08:34 -0000	1.15
+++ ssl.c	19 Oct 2007 03:19:07 -0000	1.16
@@ -364,10 +364,15 @@
     char *filename = slapi_ch_smprintf("%s/cert8.db", dir);
 	PRStatus status = PR_Access(filename, PR_ACCESS_READ_OK);
 	if (PR_SUCCESS != status) {
-        slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization",
-                        "Warning: certificate DB file %s does not exist - SSL initialization will likely fail\n",
-                        filename);
-	}
+        slapi_ch_free_string(&filename);
+        filename = slapi_ch_smprintf("%s/cert7.db", dir);
+        status = PR_Access(filename, PR_ACCESS_READ_OK);
+        if (PR_SUCCESS != status) {
+            slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization",
+                            "Warning: certificate DB file cert8.db nor cert7.db exists - SSL initialization will likely fail\n",
+                            filename);
+        }
+    }
     slapi_ch_free_string(&filename);
 }