Disable RTLD_DEEPBIND when compiled under AddressSanitizer

(cherry picked from commit cad6b39cabb78d0c0c2ae7201255948ed24766c5)

diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index f4dc47ca217aec0d7cc664e8a71b5ad08ba5f3e7..1254472fac7eb95633967d53721dc8ccedb901fc 100644 (file)
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -259,7 +259,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 93ad7954012a520878d3b0070aa073bca2749ced..e38480a275a470a469ab0739aebefe9203b0481f 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