Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27874
Modified Files:
nss_engine_init.c
Log Message:
Only NSSPassPhraseHelper needs to be required.
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nss_engine_init.c 31 May 2007 21:36:03 -0000 1.29
+++ nss_engine_init.c 7 Jun 2007 14:58:31 -0000 1.30
@@ -155,10 +155,9 @@
const char * child_argv[4];
apr_status_t rv;
- if (mc->pphrase_dialog_helper == NULL &&
- mc->pphrase_dialog_path == NULL) {
+ if (mc->pphrase_dialog_helper == NULL) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
- "Neither NSSPassPhraseHelper nor NSSPassPhraseDialog is not set. One
or the other is required.");
+ "NSSPassPhraseHelper is not set. It is required.");
nss_die();
}
Show replies by date