[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 133/156: Fix argument handling in nss_pcache

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit 84672b92cbe66b618420510b90de332b7efc4e98
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Thu Feb 20 16:47:49 2014 -0500

    Fix argument handling in nss_pcache
---
 nss_pcache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nss_pcache.c b/nss_pcache.c
index a37695b..8a80cee 100644
--- a/nss_pcache.c
+++ b/nss_pcache.c
@@ -318,7 +318,7 @@ int main(int argc, char ** argv)
     union semun semarg;
 
     if (argc < 4 || argc > 5) {
-        fprintf(stderr, "Usage: nss_pcache <semid> <fips on/off> <directory> <prefix>\n");
+        fprintf(stderr, "Usage: nss_pcache <semid> <fips on/off> <directory> [prefix]\n");
         exit(1);
     }
 
@@ -336,7 +336,7 @@ int main(int argc, char ** argv)
     PK11_ConfigurePKCS11(NULL,NULL,NULL, INTERNAL_TOKEN_NAME, NULL, NULL,NULL,NULL,8,1);
  
     /* Initialize NSS and open the certificate database read-only. */
-    rv = NSS_Initialize(argv[3], argc == 4 ? argv[4] : NULL, argc == 5 ? argv[4] : NULL, "secmod.db", NSS_INIT_READONLY);
+    rv = NSS_Initialize(argv[3], argc == 5 ? argv[4] : NULL, argc == 5 ? argv[4] : NULL, "secmod.db", NSS_INIT_READONLY);
 
     if (rv != SECSuccess) {
         fprintf(stderr, "Unable to initialize NSS database: %d\n", rv);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git