diff options
author | slavomir.katuscak%sun.com <devnull@localhost> | 2007-10-09 17:06:25 +0000 |
---|---|---|
committer | slavomir.katuscak%sun.com <devnull@localhost> | 2007-10-09 17:06:25 +0000 |
commit | d06a80f8d03da085ec06e7f4bde9147907ff94bd (patch) | |
tree | 0a99bd3e30572c4230d6fd994d3d2800eed54a4d /security | |
parent | 53f9f6ff6264332786cf55025cb392ce1e97b79c (diff) | |
download | nss-hg-d06a80f8d03da085ec06e7f4bde9147907ff94bd.tar.gz |
Bug 384639 - Adding option to disable library unloading also in optimized build.
r=nelson
Diffstat (limited to 'security')
-rw-r--r-- | security/nss/cmd/pk11mode/pk11mode.c | 2 | ||||
-rw-r--r-- | security/nss/cmd/pk11util/pk11util.c | 2 | ||||
-rw-r--r-- | security/nss/lib/dev/devmod.c | 2 | ||||
-rw-r--r-- | security/nss/lib/freebl/loader.c | 2 | ||||
-rw-r--r-- | security/nss/lib/pk11wrap/pk11load.c | 6 | ||||
-rw-r--r-- | security/nss/lib/softoken/legacydb/lginit.c | 2 | ||||
-rw-r--r-- | security/nss/lib/softoken/lgglue.c | 2 | ||||
-rw-r--r-- | security/nss/tests/memleak/memleak.sh | 8 |
8 files changed, 5 insertions, 21 deletions
diff --git a/security/nss/cmd/pk11mode/pk11mode.c b/security/nss/cmd/pk11mode/pk11mode.c index 720f013f2..dcf9a980a 100644 --- a/security/nss/cmd/pk11mode/pk11mode.c +++ b/security/nss/cmd/pk11mode/pk11mode.c @@ -903,9 +903,7 @@ cleanup: #ifdef _WIN32 FreeLibrary(hModule); #else -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (!disableUnload) { PR_UnloadLibrary(lib); } diff --git a/security/nss/cmd/pk11util/pk11util.c b/security/nss/cmd/pk11util/pk11util.c index cf84f330d..4929ad1e3 100644 --- a/security/nss/cmd/pk11util/pk11util.c +++ b/security/nss/cmd/pk11util/pk11util.c @@ -1430,9 +1430,7 @@ unloadModule(Module *module) { char *disableUnload = NULL; -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (module->library && !disableUnload) { PR_UnloadLibrary(module->library); diff --git a/security/nss/lib/dev/devmod.c b/security/nss/lib/dev/devmod.c index 5bb43bc72..748d9f84a 100644 --- a/security/nss/lib/dev/devmod.c +++ b/security/nss/lib/dev/devmod.c @@ -306,9 +306,7 @@ nssModule_Unload ( char *disableUnload = NULL; if (mod->library) { (void)CKAPI(mod->epv)->C_Finalize(NULL); -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (!disableUnload) { nssrv = PR_UnloadLibrary(mod->library); } diff --git a/security/nss/lib/freebl/loader.c b/security/nss/lib/freebl/loader.c index 2260a3cb2..19d412e11 100644 --- a/security/nss/lib/freebl/loader.c +++ b/security/nss/lib/freebl/loader.c @@ -855,9 +855,7 @@ BL_Unload(void) * never does a handshake on it, BL_Unload will be called even though freebl * was never loaded. So, don't assert blLib. */ if (blLib) { -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (!disableUnload) { PRStatus status = PR_UnloadLibrary(blLib); PORT_Assert(PR_SUCCESS == status); diff --git a/security/nss/lib/pk11wrap/pk11load.c b/security/nss/lib/pk11wrap/pk11load.c index 1c5213b4e..49d826dbe 100644 --- a/security/nss/lib/pk11wrap/pk11load.c +++ b/security/nss/lib/pk11wrap/pk11load.c @@ -445,9 +445,7 @@ fail2: } fail: mod->functionList = NULL; -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (library && !disableUnload) { PR_UnloadLibrary(library); } @@ -474,9 +472,7 @@ SECMOD_UnloadModule(SECMODModule *mod) { if (mod->internal) { if (0 == PR_AtomicDecrement(&softokenLoadCount)) { if (softokenLib) { -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (!disableUnload) { PRStatus status = PR_UnloadLibrary(softokenLib); PORT_Assert(PR_SUCCESS == status); @@ -494,9 +490,7 @@ SECMOD_UnloadModule(SECMODModule *mod) { return SECFailure; } -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (!disableUnload) { PR_UnloadLibrary(library); } diff --git a/security/nss/lib/softoken/legacydb/lginit.c b/security/nss/lib/softoken/legacydb/lginit.c index 3964f6ee7..1cf3520de 100644 --- a/security/nss/lib/softoken/legacydb/lginit.c +++ b/security/nss/lib/softoken/legacydb/lginit.c @@ -187,9 +187,7 @@ DB * rdbopen(const char *appName, const char *prefix, } /* couldn't find the entry point, unload the library and fail */ -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (!disableUnload) { PR_UnloadLibrary(lib); } diff --git a/security/nss/lib/softoken/lgglue.c b/security/nss/lib/softoken/lgglue.c index 69217ce6a..b98d62d9e 100644 --- a/security/nss/lib/softoken/lgglue.c +++ b/security/nss/lib/softoken/lgglue.c @@ -410,9 +410,7 @@ sftkdbCall_Shutdown(void) if (legacy_glue_shutdown) { crv = (*legacy_glue_shutdown)(); } -#ifdef DEBUG disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); -#endif if (!disableUnload) { PR_UnloadLibrary(legacy_glue_lib); } diff --git a/security/nss/tests/memleak/memleak.sh b/security/nss/tests/memleak/memleak.sh index 1ce46e153..618a683df 100644 --- a/security/nss/tests/memleak/memleak.sh +++ b/security/nss/tests/memleak/memleak.sh @@ -170,13 +170,13 @@ memleak_init() if [ "${BUILD_OPT}" -eq "1" ] ; then OPT="OPT" - unset NSS_DISABLE_UNLOAD else OPT="DBG" - NSS_DISABLE_UNLOAD="1" - export NSS_DISABLE_UNLOAD fi + NSS_DISABLE_UNLOAD="1" + export NSS_DISABLE_UNLOAD + SELFSERV_ATTR="-D -p ${PORT} -d ${SERVER_DB} -n ${HOSTADDR} -e ${HOSTADDR}-ec -w nss -c ABCDEF:C001:C002:C003:C004:C005:C006:C007:C008:C009:C00A:C00B:C00C:C00D:C00E:C00F:C010:C011:C012:C013:C014cdefgijklmnvyz -t 5" TSTCLNT_ATTR="-p ${PORT} -h ${HOSTADDR} -c j -f -d ${CLIENT_DB} -w nss" @@ -194,6 +194,8 @@ memleak_init() memleak_cleanup() { unset MEMLEAK_DBG + unset NSS_DISABLE_UNLOAD + . ${QADIR}/common/cleanup.sh } |