From: Amitay Isaacs <amitay@gmail.com>
Date: Mon, 26 Sep 2016 15:00:34 +0000 (+1000)
Subject: dlz-bind: Set DNS_CLIENTINFO_VERSION based on BIND version
X-Git-Tag: samba-4.4.9~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77942528d61843fc5b6e8f95cc2ed29f80534ae5;p=thirdparty%2Fsamba.git

dlz-bind: Set DNS_CLIENTINFO_VERSION based on BIND version

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit e63e51a2cfd89c5bb2c16b2521ffce864ca5b373)
---

diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h
index c1ad65bd47f..7c2163d39f1 100644
--- a/source4/dns_server/dlz_minimal.h
+++ b/source4/dns_server/dlz_minimal.h
@@ -27,8 +27,10 @@
 # define DLZ_DLOPEN_VERSION 1
 #elif defined (BIND_VERSION_9_9)
 # define DLZ_DLOPEN_VERSION 2
+# define DNS_CLIENTINFO_VERSION 1
 #elif defined (BIND_VERSION_9_10)
 # define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 1
 #else
 # error Unsupported BIND version
 #endif
@@ -97,7 +99,8 @@ typedef struct isc_sockaddr {
 	void *                          link;
 } isc_sockaddr_t;
 
-#define DNS_CLIENTINFO_VERSION 1
+#if DNS_CLIENTINFO_VERSION == 1
+
 typedef struct dns_clientinfo {
 	uint16_t version;
 	void *data;
@@ -114,6 +117,9 @@ typedef struct dns_clientinfomethods {
 	uint16_t age;
 	dns_clientinfo_sourceip_t sourceip;
 } dns_clientinfomethods_t;
+
+#endif /* DNS_CLIENTINFO_VERSION */
+
 #endif /* DLZ_DLOPEN_VERSION > 1 */
 
 /*