diff options
| author | relyea%netscape.com <devnull@localhost> | 2001-02-10 02:03:03 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2001-02-10 02:03:03 +0000 |
| commit | 585e4221dc087f8a4b84a23af16675305330f18c (patch) | |
| tree | 984bf408b08f1f998411d6909898e538db892214 /security/nss/cmd | |
| parent | b452c2a244dbb60d194a9b2a2e33b38349e019f1 (diff) | |
| download | nss-hg-585e4221dc087f8a4b84a23af16675305330f18c.tar.gz | |
Make the public interface use a flags variable instead of a billion little
Bools.
suggested and reviewed by wtc in bug 66230
Diffstat (limited to 'security/nss/cmd')
| -rw-r--r-- | security/nss/cmd/certutil/certutil.c | 2 | ||||
| -rw-r--r-- | security/nss/cmd/modutil/modutil.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c index 0553d8327..79140115d 100644 --- a/security/nss/cmd/certutil/certutil.c +++ b/security/nss/cmd/certutil/certutil.c @@ -2463,7 +2463,7 @@ main(int argc, char **argv) /* Initialize NSPR and NSS. */ PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1); rv = NSS_Initialize(SECU_ConfigDirectory(NULL), certPrefix, certPrefix, - "secmod.db", PR_FALSE, PR_FALSE, PR_FALSE, PR_FALSE); + "secmod.db", 0); if (rv != SECSuccess) { SECU_PrintPRandOSError(progName); return -1; diff --git a/security/nss/cmd/modutil/modutil.c b/security/nss/cmd/modutil/modutil.c index 81d495712..abeebaf66 100644 --- a/security/nss/cmd/modutil/modutil.c +++ b/security/nss/cmd/modutil/modutil.c @@ -506,6 +506,7 @@ init_crypto(PRBool create, PRBool readOnly) #endif Error retval; SECStatus rv; + int flags = 0; if(SECU_ConfigDirectory(dbdir)[0] == '\0') { @@ -617,8 +618,11 @@ init_crypto(PRBool create, PRBool readOnly) } /* Open/create key database */ + flags = 0; + if (readOnly) flags |= NSS_INIT_READONLY; + if (nocertdb) flags |= NSS_INIT_NOCERTDB; rv = NSS_Initialize(SECU_ConfigDirectory(NULL), dbprefix, dbprefix, - "secmod.db", readOnly, nocertdb, PR_FALSE, PR_FALSE); + "secmod.db", flags); if (rv != SECSuccess) { SECU_PrintPRandOSError(progName); retval=NSS_INITIALIZE_FAILED_ERR; |