From: Soohoon Lee <soohoon.lee@f5.com>
Date: Wed, 24 Aug 2016 02:07:42 +0000 (-0700)
Subject: ITS#8484 - Fix MozNSS initialization
X-Git-Tag: OPENLDAP_REL_ENG_2_4_46~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d14b5f83c7511fcb207093365534ef8544d29881;p=thirdparty%2Fopenldap.git

ITS#8484 - Fix MozNSS initialization
---

diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
index 1ce15dabee..7fff5b43c2 100644
--- a/libraries/libldap/tls_m.c
+++ b/libraries/libldap/tls_m.c
@@ -1142,6 +1142,8 @@ tlsm_auth_cert_handler(void *arg, PRFileDesc *fd,
 	return ret;
 }
 
+static PRCallOnceType tlsm_register_shutdown_callonce = {0,0};
+
 static SECStatus
 tlsm_nss_shutdown_cb( void *appData, void *nssData )
 {
@@ -1154,10 +1156,15 @@ tlsm_nss_shutdown_cb( void *appData, void *nssData )
 		SECMOD_DestroyModule( pem_module );
 		pem_module = NULL;
 	}
+
+	/* init callonce so it can be armed again for cases like persistent daemon with LDAP_OPT_X_TLS_NEWCTX */
+	tlsm_register_shutdown_callonce.initialized = 0;
+	tlsm_register_shutdown_callonce.inProgress = 0;
+	tlsm_register_shutdown_callonce.status = 0;
+
 	return rc;
 }
 
-static PRCallOnceType tlsm_register_shutdown_callonce = {0,0};
 static PRStatus PR_CALLBACK
 tlsm_register_nss_shutdown_cb( void )
 {