diff options
| author | emaldona%redhat.com <devnull@localhost> | 2008-09-10 14:02:00 +0000 |
|---|---|---|
| committer | emaldona%redhat.com <devnull@localhost> | 2008-09-10 14:02:00 +0000 |
| commit | c3f02b1ed21c27e5d48ffc438ff46eeb6e6ae9a5 (patch) | |
| tree | 8354e505cbdfde1e0440f64735acbf178e7a28d4 | |
| parent | cb62b2da3c2be11b6a4d9a90eea617152a35b292 (diff) | |
| download | nss-hg-c3f02b1ed21c27e5d48ffc438ff46eeb6e6ae9a5.tar.gz | |
Bug 447563: Better error messages. r=nelson
| -rw-r--r-- | security/nss/cmd/modutil/error.h | 2 | ||||
| -rw-r--r-- | security/nss/cmd/modutil/pk11.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/security/nss/cmd/modutil/error.h b/security/nss/cmd/modutil/error.h index 7b478223a..0bd532daa 100644 --- a/security/nss/cmd/modutil/error.h +++ b/security/nss/cmd/modutil/error.h @@ -60,7 +60,6 @@ typedef enum { DIR_NOT_READABLE_ERR, DIR_NOT_WRITEABLE_ERR, INVALID_CONSTANT_ERR, - ADD_MODULE_FAILED_ERR, ADD_MODULE_FAILED_STATUS_ERR, OUT_OF_MEM_ERR, DELETE_INTERNAL_ERR, @@ -114,7 +113,6 @@ static char *errStrings[] = { "ERROR: Directory \"%s\" is not readable.\n", "ERROR: Directory \"%s\" is not writeable.\n", "\"%s\" is not a recognized value.\n", - "ERROR: Failed to add module \"%s\".\n", "ERROR: Failed to add module \"%s\". Probable cause : \"%s\".\n", "ERROR: Out of memory.\n", "ERROR: Cannot delete internal module.\n", diff --git a/security/nss/cmd/modutil/pk11.c b/security/nss/cmd/modutil/pk11.c index 03db017c4..793ac7a93 100644 --- a/security/nss/cmd/modutil/pk11.c +++ b/security/nss/cmd/modutil/pk11.c @@ -301,10 +301,10 @@ AddModule(char *moduleName, char *libFile, char *cipherString, moduleName, errtxt); PR_Free(errtxt); } else { - PR_fprintf(PR_STDERR, errStrings[ADD_MODULE_FAILED_ERR], - moduleName); + PR_fprintf(PR_STDERR, errStrings[ADD_MODULE_FAILED_STATUS_ERR], + moduleName, SECU_Strerror(PORT_GetError())); } - return ADD_MODULE_FAILED_ERR; + return ADD_MODULE_FAILED_STATUS_ERR; } else { PR_fprintf(PR_STDOUT, msgStrings[ADD_MODULE_SUCCESS_MSG], moduleName); return SUCCESS; |