From: Evan Hunt <each@isc.org>
Date: Tue, 4 Mar 2014 16:58:40 +0000 (-0800)
Subject: [master] fix API mismatch bug in DLZ
X-Git-Tag: v9.10.0b2~58
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d51456e4537729c2263303350abeff45379b1105;p=thirdparty%2Fbind9.git

[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 4dd640903ca..8cb083561f8 100644
--- 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 fae251631b8..cf9ec2889f9 100644
--- 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 1c83729ed87..5e9db56fe49 100644
--- 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;
 	}