Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the behavior of the -list <module> option so that it doesn't stop

Browse Source 
at the first error it encounters when looping through the slots, and so
that it displays the slot info even if it cannot get token info. 111075


git-svn-id: svn://10.0.0.236/trunk@108719 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelsonb%netscape.com
2001-11-21 20:52:37 +00:00
parent a159436d81
commit 0b78f800ea
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/security/nss/cmd/modutil/pk11.c
View File

@@ -437,6 +437,7 @@ ListModule(char *moduleName)
CK_TOKEN_INFO tokeninfo;
char *ciphers, *mechanisms;
PK11DisableReasons reason;
Error rv = SUCCESS;
if(!moduleName) {
return SUCCESS;
@@ -495,12 +496,8 @@ ListModule(char *moduleName)
if(PK11_GetSlotInfo(slot, &slotinfo) != SECSuccess) {
PR_fprintf(PR_STDERR, errStrings[SLOT_INFO_ERR],
PK11_GetSlotName(slot));
return SLOT_INFO_ERR;
}
if(PK11_GetTokenInfo(slot, &tokeninfo) != SECSuccess) {
PR_fprintf(PR_STDERR, errStrings[TOKEN_INFO_ERR],
slot->token_name);
return TOKEN_INFO_ERR;
rv = SLOT_INFO_ERR;
continue;
}
/* Slot Info */
@@ -534,6 +531,13 @@ ListModule(char *moduleName)
PR_fprintf(PR_STDOUT, PAD"Status: Enabled\n");
}
if(PK11_GetTokenInfo(slot, &tokeninfo) != SECSuccess) {
PR_fprintf(PR_STDERR, errStrings[TOKEN_INFO_ERR],
slot->token_name);
rv = TOKEN_INFO_ERR;
continue;
}
/* Token Info */
PR_fprintf(PR_STDOUT, PAD"Token Name: %.32s\n",
tokeninfo.label);
@@ -565,7 +569,7 @@ ListModule(char *moduleName)
}
PR_fprintf(PR_STDOUT,
"\n-----------------------------------------------------------\n");
return SUCCESS;
return rv;
}
/************************************************************************