summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbishakhabanerjee%netscape.com <devnull@localhost>2003-04-01 19:00:50 +0000
committerbishakhabanerjee%netscape.com <devnull@localhost>2003-04-01 19:00:50 +0000
commit3d1a5d44383a136b00fef6688113547f53a828ef (patch)
tree60c4d62fcf5b13b0df453ee7941fdd4dfc5bcf16
parent51b67586f0756691cc20298abc691e966b2956c2 (diff)
downloadnss-hg-3d1a5d44383a136b00fef6688113547f53a828ef.tar.gz
checking return value of NSS_Shutdown() - bug 171263
-rw-r--r--security/nss/cmd/SSLsample/sslsample.c3
-rw-r--r--security/nss/cmd/ocspclnt/ocspclnt.c4
-rw-r--r--security/nss/cmd/sdrtest/sdrtest.c4
-rw-r--r--security/nss/cmd/vfyserv/vfyutil.c3
4 files changed, 10 insertions, 4 deletions
diff --git a/security/nss/cmd/SSLsample/sslsample.c b/security/nss/cmd/SSLsample/sslsample.c
index 47b7d0d4f..5a25b940d 100644
--- a/security/nss/cmd/SSLsample/sslsample.c
+++ b/security/nss/cmd/SSLsample/sslsample.c
@@ -363,7 +363,8 @@ exitErr(char *function)
{
errWarn(function);
/* Exit gracefully. */
- NSS_Shutdown();
+ /* ignoring return value of NSS_Shutdown as code exits with 1*/
+ (void) NSS_Shutdown();
PR_Cleanup();
exit(1);
}
diff --git a/security/nss/cmd/ocspclnt/ocspclnt.c b/security/nss/cmd/ocspclnt/ocspclnt.c
index a5a1448c6..309d08538 100644
--- a/security/nss/cmd/ocspclnt/ocspclnt.c
+++ b/security/nss/cmd/ocspclnt/ocspclnt.c
@@ -1211,7 +1211,9 @@ nssdone:
(void) CERT_DisableOCSPChecking (handle);
}
- NSS_Shutdown ();
+ if (NSS_Shutdown () != SECSuccess) {
+ exit(1);
+ }
prdone:
PR_Cleanup ();
diff --git a/security/nss/cmd/sdrtest/sdrtest.c b/security/nss/cmd/sdrtest/sdrtest.c
index 5f82ff880..e9cd8e39b 100644
--- a/security/nss/cmd/sdrtest/sdrtest.c
+++ b/security/nss/cmd/sdrtest/sdrtest.c
@@ -295,7 +295,9 @@ file_loser:
loser:
if (text.data) free(text.data);
if (result.data) free(result.data);
- NSS_Shutdown();
+ if (NSS_Shutdown() != SECSuccess)
+ exit(1);
+ }
prdone:
PR_Cleanup ();
diff --git a/security/nss/cmd/vfyserv/vfyutil.c b/security/nss/cmd/vfyserv/vfyutil.c
index 6e0f59d04..10e393458 100644
--- a/security/nss/cmd/vfyserv/vfyutil.c
+++ b/security/nss/cmd/vfyserv/vfyutil.c
@@ -381,7 +381,8 @@ exitErr(char *function)
{
errWarn(function);
/* Exit gracefully. */
- NSS_Shutdown();
+ /* ignoring return value of NSS_Shutdown as code exits with 1 anyway*/
+ (void) NSS_Shutdown();
PR_Cleanup();
exit(1);
}