[patch] batch for bind-9.16

bind-16.patch (text/plain), 2.73 KB, created by René Fuchs on 2020-09-28 10:28:06 UTC

--- a/source4/dns_server/wscript_build_orig	2019-10-30 17:29:56.702697971 +0100
+++ b/source4/dns_server/wscript_build	2019-10-30 17:30:45.716293016 +0100
@@ -68,6 +68,16 @@
                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
 
+bld.SAMBA_LIBRARY('dlz_bind9_16',
+                  source='dlz_bind9.c',
+                  cflags='-DBIND_VERSION_9_16',
+                  private_library=True,
+                  link_name='modules/bind9/dlz_bind9_16.so',
+                  realname='dlz_bind9_16.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',
--- a/source4/setup/named.conf.dlz_orig	2019-10-30 17:57:29.066372206 +0100
+++ b/source4/setup/named.conf.dlz	2019-10-30 17:52:43.107095235 +0100
@@ -24,5 +24,8 @@
 
     # For BIND 9.12.x
     ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
+
+    # For BIND 9.16.x
+    ${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so";
 };
 
--- a/source4/dns_server/dlz_minimal.h_orig	2019-10-30 18:05:21.301677802 +0100
+++ b/source4/dns_server/dlz_minimal.h	2019-10-30 18:05:59.622917539 +0100
@@ -37,6 +37,9 @@
 #elif defined (BIND_VERSION_9_12)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 2
+#elif defined (BIND_VERSION_9_16)
+# define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 2
 #else
 # error Unsupported BIND version
 #endif
--- a/python/samba/provision/sambadns.py_orig     2019-10-30 19:29:40.795532004 +0100
+++ b/python/samba/provision/sambadns.py  2019-10-30 19:33:03.162076711 +0100
@@ -960,6 +960,7 @@
         bind9_10 = '#'
         bind9_11 = '#'
         bind9_12 = '#'
+        bind9_16 = '#'
         if bind_info.upper().find('BIND 9.8') != -1:
             bind9_8 = ''
         elif bind_info.upper().find('BIND 9.9') != -1:
@@ -970,6 +971,8 @@
             bind9_11 = ''
         elif bind_info.upper().find('BIND 9.12') != -1:
             bind9_12 = ''
+        elif bind_info.upper().find('BIND 9.16') != -1:
+            bind9_16 = ''
         elif bind_info.upper().find('BIND 9.7') != -1:
             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
         else:
@@ -981,7 +984,8 @@
                     "BIND9_9": bind9_9,
                     "BIND9_10": bind9_10,
                     "BIND9_11": bind9_11,
-                    "BIND9_12": bind9_12
+                    "BIND9_12": bind9_12,
+                    "BIND9_16": bind9_16
 
                     })