Restore idempontency to nss_init*

1 files changed, 8 insertions, 0 deletions

diff --git a/security/nss/lib/nss/nssinit.c b/security/nss/lib/nss/nssinit.c
index 24b021d65..d6ce45ee8 100644
--- a/security/nss/lib/nss/nssinit.c
+++ b/security/nss/lib/nss/nssinit.c
@@ -315,6 +315,8 @@ nss_FindExternalRoot(const char *dbpath)
  * 			be opened.
  */
 
+static PRBool nss_IsInitted = PR_FALSE;
+
 static SECStatus
 nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
 		 const char *secmodName, PRBool readOnly, PRBool noCertDB, 
@@ -328,6 +330,10 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
     char *lkeyPrefix = NULL;
     char *lsecmodName = NULL;
 
+    if (nss_IsInitted) {
+	return SECSuccess;
+    }
+
     flags = nss_makeFlags(readOnly,noCertDB,noModDB,forceOpen,
 						pk11_password_required);
     if (flags == NULL) return rv;
@@ -387,6 +393,7 @@ loser:
 	    }
 	}
 #endif
+	nss_IsInitted = PR_TRUE;
     }
     return rv;
 }
@@ -452,6 +459,7 @@ NSS_Shutdown(void)
     SECOID_Shutdown();
     SECMOD_Shutdown();
     STAN_Shutdown();
+    nss_IsInitted = PR_FALSE;
 }