[master] fix API mismatch bug in DLZ

3775.	[bug]		dlz_dlopen driver could return the wrong error
			code on API version mismatch, leading to a segfault.
			[RT #35495]

diff --git a/CHANGES b/CHANGES
index 4dd640903ca2b62dcf26368b27653c596bf58eb3..8cb083561f8eb3b7292a416995a52f113c32fbea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3775.  [bug]           dlz_dlopen driver could return the wrong error
+                       code on API version mismatch, leading to a segfault.
+                       [RT #35495]
+
 3774.  [func]          When using "request-nsid", log the NSID value in
                        printable form as well as hex. [RT #20864]
 

diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index fae251631b885d283fcb3ad734d7441f19728415..cf9ec2889f98187bdc06ccc07b8ada77d4e90a82 100644 (file)
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -335,6 +335,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
                           "dlz_dlopen: %s: incorrect driver API version %d, "
                           "requires %d",
                           cd->dl_path, cd->version, DLZ_DLOPEN_VERSION);
+               result = ISC_R_FAILURE;
                goto failed;
        }
 

diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c
index 1c83729ed870e975bff346c94f694af6a7d6a782..5e9db56fe49dd27d5731c6a645be9d555a7b3049 100644 (file)
--- a/bin/named/win32/dlz_dlopen_driver.c
+++ b/bin/named/win32/dlz_dlopen_driver.c
@@ -319,6 +319,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
                           "dlz_dlopen: %s: incorrect driver API version %d, "
                           "requires %d",
                           cd->dl_path, cd->version, DLZ_DLOPEN_VERSION);
+               result = ISC_R_FAILURE;
                goto failed;
        }