[SCM] Samba Shared Repository - branch v4-5-test updated
Karolin Seeger
kseeger at samba.org
Thu Nov 3 11:55:06 UTC 2016
The branch, v4-5-test has been updated
via 9f2a816 provision: Add support for BIND 9.11.x
via 9994b03 dlz-bind: Add support for BIND 9.11.x
via bf846e7 dlz-bind: Set DNS_CLIENTINFO_VERSION based on BIND version
via f90c569 dlz-bind: Fix initialization of DLZ_DLOPEN_AGE
via 1ca221e dlz-bind: Fix preprocessor checks for BIND versions
from 5eb8a18 ctdb-packaging: Move CTDB tests to /usr/local/share/ctdb/tests/
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-5-test
- Log -----------------------------------------------------------------
commit 9f2a8169a3239b915119506935c1483bdba3564c
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Sep 27 00:51:03 2016 +1000
provision: Add support for BIND 9.11.x
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri Oct 28 03:42:25 CEST 2016 on sn-devel-144
(cherry picked from commit 2959c8888d46902e140963ed4190d23a7609b8da)
Autobuild-User(v4-5-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-5-test): Thu Nov 3 12:54:11 CET 2016 on sn-devel-144
commit 9994b03d41833e5ca3e691918367d65b1edca3fc
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Sep 27 00:51:03 2016 +1000
dlz-bind: Add support for BIND 9.11.x
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit c8c330d5f4921aaca803b9ff571aacb0dde0c7bc)
commit bf846e79df57eae54dc0da9577a1c92d94895e78
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Sep 27 01:00:34 2016 +1000
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 at gmail.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit e63e51a2cfd89c5bb2c16b2521ffce864ca5b373)
commit f90c56973a51dcdc8705acce59a36c0572a0a777
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Sep 27 00:57:00 2016 +1000
dlz-bind: Fix initialization of DLZ_DLOPEN_AGE
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 370d6baaa60ca7aacab85852622cdca8bdb06d34)
commit 1ca221e8703baf85a6b3d45aa528eaad030e40f7
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Sep 27 00:52:53 2016 +1000
dlz-bind: Fix preprocessor checks for BIND versions
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit fbafd2699b03902cbb7e5131ed7d345190798392)
-----------------------------------------------------------------------
Summary of changes:
python/samba/provision/sambadns.py | 6 ++++-
source4/dns_server/dlz_minimal.h | 54 +++++++++++++++++++++++++++++++-------
source4/dns_server/wscript_build | 10 +++++++
source4/setup/named.conf.dlz | 3 +++
4 files changed, 63 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 67d34e5..df4673b 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -923,12 +923,15 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
bind9_8 = '#'
bind9_9 = '#'
bind9_10 = '#'
+ bind9_11 = '#'
if bind_info.upper().find('BIND 9.8') != -1:
bind9_8 = ''
elif bind_info.upper().find('BIND 9.9') != -1:
bind9_9 = ''
elif bind_info.upper().find('BIND 9.10') != -1:
bind9_10 = ''
+ elif bind_info.upper().find('BIND 9.11') != -1:
+ bind9_11 = ''
elif bind_info.upper().find('BIND 9.7') != -1:
raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
else:
@@ -938,7 +941,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
"MODULESDIR" : samba.param.modules_dir(),
"BIND9_8" : bind9_8,
"BIND9_9" : bind9_9,
- "BIND9_10" : bind9_10
+ "BIND9_10" : bind9_10,
+ "BIND9_11" : bind9_11
})
diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h
index 11187f7..89ada7a 100644
--- a/source4/dns_server/dlz_minimal.h
+++ b/source4/dns_server/dlz_minimal.h
@@ -23,15 +23,23 @@
#ifndef DLZ_MINIMAL_H
#define DLZ_MINIMAL_H 1
-#ifdef BIND_VERSION_9_8
-#define DLZ_DLOPEN_VERSION 1
-#elif BIND_VERSION_9_9
-#define DLZ_DLOPEN_VERSION 2
-#elif BIND_VERSION_9_10
-#define DLZ_DLOPEN_VERSION 3
-#define DLZ_DLOPEN_AGE 0
+#if defined (BIND_VERSION_9_8)
+# 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
+#elif defined (BIND_VERSION_9_11)
+# define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 2
#else
-#error Unsupported BIND version
+# error Unsupported BIND version
+#endif
+
+#if DLZ_DLOPEN_VERSION > 1
+# define DLZ_DLOPEN_AGE 0
#endif
typedef unsigned int isc_result_t;
@@ -94,7 +102,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;
@@ -111,6 +120,33 @@ typedef struct dns_clientinfomethods {
uint16_t age;
dns_clientinfo_sourceip_t sourceip;
} dns_clientinfomethods_t;
+
+#elif DNS_CLIENTINFO_VERSION == 2
+
+typedef struct dns_clientinfo {
+ uint16_t version;
+ void *data;
+ void *dbversion;
+} dns_clientinfo_t;
+
+typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client,
+ isc_sockaddr_t **addrp);
+
+typedef isc_result_t (*dns_clientinfo_version_t)(dns_clientinfo_t *client,
+ void **addrp);
+
+#define DNS_CLIENTINFOMETHODS_VERSION 2
+#define DNS_CLIENTINFOMETHODS_AGE 1
+
+typedef struct dns_clientinfomethods {
+ uint16_t version;
+ uint16_t age;
+ dns_clientinfo_sourceip_t sourceip;
+ dns_clientinfo_version_t dbversion;
+} dns_clientinfomethods_t;
+
+#endif /* DNS_CLIENTINFO_VERSION */
+
#endif /* DLZ_DLOPEN_VERSION > 1 */
/*
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index 75f3499..396ed76 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -47,6 +47,16 @@ bld.SAMBA_LIBRARY('dlz_bind9_10',
deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
enabled=bld.AD_DC_BUILD_IS_ENABLED())
+bld.SAMBA_LIBRARY('dlz_bind9_11',
+ source='dlz_bind9.c',
+ cflags='-DBIND_VERSION_9_11',
+ private_library=True,
+ link_name='modules/bind9/dlz_bind9_11.so',
+ realname='dlz_bind9_11.so',
+ install_path='${MODULESDIR}/bind9',
+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
+
bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
source='dlz_bind9.c',
cflags='-DBIND_VERSION_9_8',
diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz
index 460d2ca..215af5a 100644
--- a/source4/setup/named.conf.dlz
+++ b/source4/setup/named.conf.dlz
@@ -18,5 +18,8 @@ dlz "AD DNS Zone" {
# For BIND 9.10.x
${BIND9_10} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_10.so";
+
+ # For BIND 9.11.x
+ ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so";
};
--
Samba Shared Repository
More information about the samba-cvs
mailing list