diff options
| author | relyea%netscape.com <devnull@localhost> | 2002-04-05 03:16:41 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2002-04-05 03:16:41 +0000 |
| commit | 45437d806dab9be1be9aeadb4a223ea23660b90c (patch) | |
| tree | 3066c2b6512020365f1eca3bb7a96b3c07a2c969 | |
| parent | e29c45ed625f000bd8d6bb8c0e5ab17eb15ef7ef (diff) | |
| download | nss-hg-45437d806dab9be1be9aeadb4a223ea23660b90c.tar.gz | |
return the correct error codes to make all.sh happy.
| -rw-r--r-- | security/nss/cmd/certutil/certutil.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c index 3c6e98b16..4c431861d 100644 --- a/security/nss/cmd/certutil/certutil.c +++ b/security/nss/cmd/certutil/certutil.c @@ -597,7 +597,7 @@ listCerts(CERTCertDBHandle *handle, char *name, PK11SlotInfo *slot, CERTCertificate *cert; SECItem data; PRInt32 numBytes; - SECStatus rv; + SECStatus rv = SECFailure; /* List certs on a non-internal slot. */ if (!PK11_IsFriendly(slot) && PK11_NeedLogin(slot)) @@ -636,6 +636,7 @@ listCerts(CERTCertDBHandle *handle, char *name, PK11SlotInfo *slot, SECU_PrintCertNickname(node->cert,stdout); } CERT_DestroyCertList(certs); + rv = SECSuccess; } } if (rv) { @@ -930,14 +931,19 @@ listKeys(PK11SlotInfo *slot, KeyType keyType, void *pwarg) list = PK11_ListPrivateKeysInSlot(slot); if (list == NULL) { - SECU_PrintError(progName, "problem listing keys"); - return SECFailure; + SECU_PrintError(progName, "problem listing keys"); + return SECFailure; } for (count=0, node=PRIVKEY_LIST_HEAD(list) ; !PRIVKEY_LIST_END(node,list); node= PRIVKEY_LIST_NEXT(node),count++) { secu_PrintKey(stdout, count, node->key); } SECKEY_DestroyPrivateKeyList(list); + + if (count == 0) { + SECU_PrintError(progName, "no keys found"); + return SECFailure; + } return SECSuccess; } |