Disable RTLD_DEEPBIND when compiled under AddressSanitizer

diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 8f540edb55c243f15ea569d4b337e313945655df..016b39086240f02795ac9d42b444e312270b330f 100644 (file)
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -257,7 +257,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
        /* Open the library */
        dlopen_flags = RTLD_NOW|RTLD_GLOBAL;
 
-#ifdef RTLD_DEEPBIND
+#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
        /*
         * If RTLD_DEEPBIND is available then use it. This can avoid
         * issues with a module using a different version of a system

diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c
index 932244a8dbc94ebee999ab7064c70514f352f971..47cb3374a3602b7a1b38db72c3f593acaefae025 100644 (file)
--- a/lib/dns/dyndb.c
+++ b/lib/dns/dyndb.c
@@ -133,7 +133,7 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname,
                      instname, filename);
 
        flags = RTLD_NOW|RTLD_LOCAL;
-#ifdef RTLD_DEEPBIND
+#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
        flags |= RTLD_DEEPBIND;
 #endif
 

diff --git a/lib/ns/hooks.c b/lib/ns/hooks.c
index d79c29f3554bf44ec5de716739e71852e87279ed..c5212428f1bd00a77dd541711f887b154a142cef 100644 (file)
--- a/lib/ns/hooks.c
+++ b/lib/ns/hooks.c
@@ -109,7 +109,7 @@ load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) {
        REQUIRE(pluginp != NULL && *pluginp == NULL);
 
        flags = RTLD_LAZY | RTLD_LOCAL;
-#ifdef RTLD_DEEPBIND
+#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
        flags |= RTLD_DEEPBIND;
 #endif