diff options
| author | kirk.erickson%sun.com <devnull@localhost> | 2003-02-25 02:09:11 +0000 |
|---|---|---|
| committer | kirk.erickson%sun.com <devnull@localhost> | 2003-02-25 02:09:11 +0000 |
| commit | 3df95a73c887f9aa10b964e3a94687507a2c852d (patch) | |
| tree | c300e0b098d5cf4d2a837144c17bf39919dec48d | |
| parent | 7d463bc6d34e3188a2ce1aa1b4707f610e830d2e (diff) | |
| download | nss-hg-3df95a73c887f9aa10b964e3a94687507a2c852d.tar.gz | |
Addresses bug 193378 modutil should print an error message,
by printing error on SECMOD_DeleteInternalModule() failure.
| -rw-r--r-- | security/nss/cmd/modutil/pk11.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/security/nss/cmd/modutil/pk11.c b/security/nss/cmd/modutil/pk11.c index 25a10c25f..5a4041169 100644 --- a/security/nss/cmd/modutil/pk11.c +++ b/security/nss/cmd/modutil/pk11.c @@ -47,7 +47,6 @@ static int pk11_DefaultArraySize = 0; Error FipsMode(char *arg) { - char *internal_name; if(!PORT_Strcasecmp(arg, "true")) { @@ -55,6 +54,7 @@ FipsMode(char *arg) internal_name = PR_smprintf("%s", SECMOD_GetInternalModule()->commonName); if(SECMOD_DeleteInternalModule(internal_name) != SECSuccess) { + PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError())); PR_smprintf_free(internal_name); PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]); return FIPS_SWITCH_FAILED_ERR; @@ -74,6 +74,7 @@ FipsMode(char *arg) internal_name = PR_smprintf("%s", SECMOD_GetInternalModule()->commonName); if(SECMOD_DeleteInternalModule(internal_name) != SECSuccess) { + PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError())); PR_smprintf_free(internal_name); PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]); return FIPS_SWITCH_FAILED_ERR; @@ -105,9 +106,6 @@ FipsMode(char *arg) Error ChkFipsMode(char *arg) { - - char *internal_name; - if(!PORT_Strcasecmp(arg, "true")) { if (PK11_IsFIPS()) { PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]); @@ -340,7 +338,6 @@ RawListModule(char *modulespec) { SECMODModule *module; char **moduleSpecList; - SECStatus rv; module = SECMOD_LoadModule(modulespec,NULL,PR_FALSE); if (module == NULL) { |