[Fedora-directory-commits] mod_nss nss_engine_pphrase.c,1.7,1.8

[Robert Crittenden (rcritten)]

Author: rcritten

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

Modified Files:
	nss_engine_pphrase.c 
Log Message:
208848

If the password stored in a file pointed to by NSSPassPhraseDialog
didn't match the database password then Apache would core on
Solaris (because passwd was NULL). The error message is still a bit
lackluster but at least it doesn't core anymore.



Index: nss_engine_pphrase.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_pphrase.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nss_engine_pphrase.c	25 Aug 2006 20:19:48 -0000	1.7
+++ nss_engine_pphrase.c	2 Oct 2006 15:57:47 -0000	1.8
@@ -126,7 +126,7 @@
         }
     }
 
-    if (parg->mc->nInitCount == 1) {
+    if ((parg->mc->nInitCount == 1) && (passwd != NULL)) {
         char buf[1024];
         apr_status_t rv;
         apr_size_t nBytes = 1024;