checking return value of NSS_Shutdown() - bug 171263

3 files changed, 9 insertions, 3 deletions

diff --git a/security/nss/cmd/pkiutil/pkiutil.c b/security/nss/cmd/pkiutil/pkiutil.c
index 7d45c3191..f922debab 100644
--- a/security/nss/cmd/pkiutil/pkiutil.c
+++ b/security/nss/cmd/pkiutil/pkiutil.c
@@ -365,7 +365,9 @@ main(int argc, char **argv)
 #endif
 
 done:
-    NSS_Shutdown();
+    if (NSS_Shutdown() != SECSuccess) {
+	exit(1);
+    }
 
     return rv;
 }
diff --git a/security/nss/cmd/shlibsign/shlibsign.c b/security/nss/cmd/shlibsign/shlibsign.c
index 566c91214..727af31e3 100644
--- a/security/nss/cmd/shlibsign/shlibsign.c
+++ b/security/nss/cmd/shlibsign/shlibsign.c
@@ -405,7 +405,9 @@ main (int argc, char **argv)
     retval = 0;
 
 loser:
-    NSS_Shutdown();
+    if (NSS_Shutdown() != SECSuccess) {
+	exit(1);
+    }
 
 prdone:
     PR_Cleanup ();
diff --git a/security/nss/cmd/tests/remtest.c b/security/nss/cmd/tests/remtest.c
index 0c8ddaecf..b17bc0f8b 100644
--- a/security/nss/cmd/tests/remtest.c
+++ b/security/nss/cmd/tests/remtest.c
@@ -154,7 +154,9 @@ int main(int argc, char **argv)
 	}
     } while (cont);
 
-    NSS_Shutdown();
+    if (NSS_Shutdown() != SECSuccess) {
+        exit(1);
+    }
     PR_Cleanup();
     return 0;
 }