From 16f50b3731a99bb68d4a601d5def7518411e1aaf Mon Sep 17 00:00:00 2001
From: rcritten <>
Date: Mon, 2 Oct 2006 15:57:47 +0000
Subject: 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.
---
 nss_engine_pphrase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nss_engine_pphrase.c b/nss_engine_pphrase.c
index 8ba489a..981ebff 100644
--- a/nss_engine_pphrase.c
+++ b/nss_engine_pphrase.c
@@ -126,7 +126,7 @@ static char * nss_password_prompt(PK11SlotInfo *slot, PRBool retry, void *arg)
         }
     }
 
-    if (parg->mc->nInitCount == 1) {
+    if ((parg->mc->nInitCount == 1) && (passwd != NULL)) {
         char buf[1024];
         apr_status_t rv;
         apr_size_t nBytes = 1024;
-- 
cgit