upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-28 10:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6802 restart modules for fork() - from Rich Megginson @ Red Hat

Browse source
This commit is contained in:
Howard Chu 2011-01-27 21:38:40 +00:00
parent ba70ec8b2c
commit d27f458b37
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libraries/libldap/tls_m.c
View file

@ -68,6 +68,13 @@
#define HAVE_NSS_INITCONTEXT 1
#endif
/* NSS 3.12.9 and later have SECMOD_RestartModules */
#if NSS_VMAJOR <= 3 && NSS_VMINOR <= 12 && NSS_VPATCH < 9
/* do nothing */
#else
#define HAVE_SECMOD_RESTARTMODULES 1
#endif
/* InitContext does not currently work in server mode */
/* #define INITCONTEXT_HACK 1 */
@ -1482,6 +1489,24 @@ tlsm_deferred_init( void *arg )
SECStatus rc;
int done = 0;
#ifdef HAVE_SECMOD_RESTARTMODULES
/* NSS enforces the pkcs11 requirement that modules should be unloaded after
a fork() - since there is no portable way to determine if NSS has been
already initialized in a parent process, we just call SECMOD_RestartModules
with force == FALSE - if the module has been unloaded due to a fork, it will
be reloaded, otherwise, it is a no-op */
if ( SECFailure == ( rc = SECMOD_RestartModules(PR_FALSE /* do not force */) ) ) {
errcode = PORT_GetError();
if ( errcode != SEC_ERROR_NOT_INITIALIZED ) {
Debug( LDAP_DEBUG_TRACE,
"TLS: could not restart the security modules: %d:%s\n",
errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ), 0 );
} else {
errcode = 1;
}
}
#endif
#ifdef HAVE_NSS_INITCONTEXT
memset( &initParams, 0, sizeof( initParams ) );
initParams.length = sizeof( initParams );