diff --git a/mozilla/security/nss/cmd/SSLsample/client.c b/mozilla/security/nss/cmd/SSLsample/client.c
index 0953faeae68..e5cd1013c31 100644
--- a/mozilla/security/nss/cmd/SSLsample/client.c
+++ b/mozilla/security/nss/cmd/SSLsample/client.c
@@ -444,7 +444,9 @@ main(int argc, char **argv)
 
 	client_main(port, connections, hostName);
 
-	NSS_Shutdown();
+	if (NSS_Shutdown() != SECSuccess) {
+            exit(1);
+        }
 	PR_Cleanup();
 	return 0;
 }
diff --git a/mozilla/security/nss/cmd/SSLsample/server.c b/mozilla/security/nss/cmd/SSLsample/server.c
index 83d80fb45d3..08c20a5a4bb 100644
--- a/mozilla/security/nss/cmd/SSLsample/server.c
+++ b/mozilla/security/nss/cmd/SSLsample/server.c
@@ -814,7 +814,9 @@ main(int argc, char **argv)
 	server_main(port, requestCert, privKey, cert, disableSSL3);
 
 	/* Shutdown NSS and exit NSPR gracefully. */
-	NSS_Shutdown();
+	if (NSS_Shutdown() != SECSuccess) {
+            exit(1);
+        }
 	PR_Cleanup();
 	return 0;
 }
diff --git a/mozilla/security/nss/cmd/addbuiltin/addbuiltin.c b/mozilla/security/nss/cmd/addbuiltin/addbuiltin.c
index 65db6236bc8..16285f8687d 100644
--- a/mozilla/security/nss/cmd/addbuiltin/addbuiltin.c
+++ b/mozilla/security/nss/cmd/addbuiltin/addbuiltin.c
@@ -34,7 +34,7 @@
 /*
  * Tool for converting builtin CA certs.
  *
- * $Id: addbuiltin.c,v 1.5 2002-10-30 17:22:06 relyea%netscape.com Exp $
+ * $Id: addbuiltin.c,v 1.6 2003-01-07 22:22:10 bishakhabanerjee%netscape.com Exp $
  */
 
 #include "nss.h"
@@ -194,7 +194,7 @@ printheader() {
      "# may use your version of this file under either the MPL or the\n"
      "# GPL.\n"
      "#\n"
-     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.5 $ $Date: 2002-10-30 17:22:06 $ $Name: not supported by cvs2svn $\"\n"
+     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.6 $ $Date: 2003-01-07 22:22:10 $ $Name: not supported by cvs2svn $\"\n"
      "\n"
      "#\n"
      "# certdata.txt\n"
@@ -349,7 +349,9 @@ main(int argc, char **argv)
 	exit(1);
     }
     
-    NSS_Shutdown();
+    if (NSS_Shutdown() != SECSuccess) {
+        exit(1);
+    }
 
     return(SECSuccess);
 }
diff --git a/mozilla/security/nss/cmd/certutil/certutil.c b/mozilla/security/nss/cmd/certutil/certutil.c
index a78b75db8c7..46ebe3b8b67 100644
--- a/mozilla/security/nss/cmd/certutil/certutil.c
+++ b/mozilla/security/nss/cmd/certutil/certutil.c
@@ -2825,7 +2825,10 @@ shutdown:
     if (pubkey) {
 	SECKEY_DestroyPublicKey(pubkey);
     }
-    NSS_Shutdown();
+
+    if (NSS_Shutdown() != SECSuccess) {
+        exit(1);
+    }
 
     if (rv == SECSuccess) {
 	return 0;
diff --git a/mozilla/security/nss/cmd/crlutil/crlutil.c b/mozilla/security/nss/cmd/crlutil/crlutil.c
index 3cce19e1e83..ebe2da49816 100644
--- a/mozilla/security/nss/cmd/crlutil/crlutil.c
+++ b/mozilla/security/nss/cmd/crlutil/crlutil.c
@@ -469,6 +469,9 @@ int main(int argc, char **argv)
 	}
 #endif    
     }
-    NSS_Shutdown();
+    if (NSS_Shutdown() != SECSuccess) {
+        exit(1);
+    }
+
     return (rv);
 }
diff --git a/mozilla/security/nss/cmd/modutil/modutil.c b/mozilla/security/nss/cmd/modutil/modutil.c
index 2f1886b47e5..fea5e4cc711 100644
--- a/mozilla/security/nss/cmd/modutil/modutil.c
+++ b/mozilla/security/nss/cmd/modutil/modutil.c
@@ -912,7 +912,10 @@ main(int argc, char *argv[])
 		break;
 	}
 
-        NSS_Shutdown();
+        if (NSS_Shutdown() != SECSuccess) {
+            exit(1);
+        }
+
 loser:
 	PR_Cleanup();
 	return errcode;
diff --git a/mozilla/security/nss/cmd/strsclnt/strsclnt.c b/mozilla/security/nss/cmd/strsclnt/strsclnt.c
index 461ba0641b0..89feed77835 100644
--- a/mozilla/security/nss/cmd/strsclnt/strsclnt.c
+++ b/mozilla/security/nss/cmd/strsclnt/strsclnt.c
@@ -1144,7 +1144,10 @@ main(int argc, char **argv)
                 (certsTested != connections);
 
     exitVal = ( exitVal || failed_already );
-    NSS_Shutdown();
+    if (NSS_Shutdown() != SECSuccess) {
+        exit(1);
+    }
+
     PR_Cleanup();
     return exitVal;
 }
diff --git a/mozilla/security/nss/cmd/vfyserv/vfyserv.c b/mozilla/security/nss/cmd/vfyserv/vfyserv.c
index 96e39c4d5f4..288319dcda4 100644
--- a/mozilla/security/nss/cmd/vfyserv/vfyserv.c
+++ b/mozilla/security/nss/cmd/vfyserv/vfyserv.c
@@ -447,7 +447,10 @@ main(int argc, char **argv)
 
 	client_main(port, connections, hostName);
 
-	NSS_Shutdown();
+        if (NSS_Shutdown() != SECSuccess) {
+            exit(1);
+        }
+
 	PR_Cleanup();
 	PORT_Free(progName);
 	return 0;