From d14b5f83c7511fcb207093365534ef8544d29881 Mon Sep 17 00:00:00 2001 From: Soohoon Lee Date: Tue, 23 Aug 2016 19:07:42 -0700 Subject: [PATCH] ITS#8484 - Fix MozNSS initialization --- libraries/libldap/tls_m.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 ) { -- 2.47.2