diff options
| author | rcritten <> | 2006-10-02 15:57:47 +0000 |
|---|---|---|
| committer | rcritten <> | 2006-10-02 15:57:47 +0000 |
| commit | 16f50b3731a99bb68d4a601d5def7518411e1aaf (patch) | |
| tree | 15ebc5559043307354627aa67daeac61a04068fc /nss_engine_pphrase.c | |
| parent | bb0f6cad431aa8dfd6ec6dbc73a90f40ee85aaff (diff) | |
| download | mod_nss-16f50b3731a99bb68d4a601d5def7518411e1aaf.tar.gz mod_nss-16f50b3731a99bb68d4a601d5def7518411e1aaf.tar.xz mod_nss-16f50b3731a99bb68d4a601d5def7518411e1aaf.zip | |
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.
Diffstat (limited to 'nss_engine_pphrase.c')
| -rw-r--r-- | nss_engine_pphrase.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |