[patch] bind modules patch

bind-15.patch (text/plain), 3.29 KB, created by René Fuchs on 2019-11-04 09:29:19 UTC

--- a/source4/dns_server/wscript_build_orig	2019-11-04 10:10:28.177191971 +0100
+++ b/source4/dns_server/wscript_build	2019-11-04 10:11:07.638437717 +0100
@@ -68,6 +68,27 @@
                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
 
+bld.SAMBA_LIBRARY('dlz_bind9_14',
+                  source='dlz_bind9.c',
+                  cflags='-DBIND_VERSION_9_14',
+                  private_library=True,
+                  link_name='modules/bind9/dlz_bind9_14.so',
+                  realname='dlz_bind9_14.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_15',
+                  source='dlz_bind9.c',
+                  cflags='-DBIND_VERSION_9_15',
+                  private_library=True,
+                  link_name='modules/bind9/dlz_bind9_15.so',
+                  realname='dlz_bind9_15.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-11-04 10:11:46.049650329 +0100
+++ b/source4/setup/named.conf.dlz	2019-11-04 10:12:09.240382453 +0100
@@ -24,5 +24,11 @@
 
     # For BIND 9.12.x
     ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
+    
+    # For BIND 9.14.x
+    ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so";
+    
+    # For BIND 9.15.x
+    ${BIND9_15} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_15.so";
 };
 
--- a/source4/dns_server/dlz_minimal.hs_orig	2019-11-04 10:12:36.421240558 +0100
+++ b/source4/dns_server/dlz_minimal.h	2019-11-04 10:13:13.102398594 +0100
@@ -37,6 +37,12 @@
 #elif defined (BIND_VERSION_9_12)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 2
+#elif defined (BIND_VERSION_9_14)
+# define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 2
+#elif defined (BIND_VERSION_9_15)
+# define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 2
 #else
 # error Unsupported BIND version
 #endif
--- a/python/samba/provision/sambadns.py_orig	2019-11-04 10:13:37.943182822 +0100
+++ b/python/samba/provision/sambadns.py	2019-11-04 10:14:16.934413819 +0100
@@ -970,6 +970,10 @@
             bind9_11 = ''
         elif bind_info.upper().find('BIND 9.12') != -1:
             bind9_12 = ''
+        elif bind_info.upper().find('BIND 9.14') != -1:
+            bind9_14 = ''
+        elif bind_info.upper().find('BIND 9.15') != -1:
+            bind9_15 = ''
         elif bind_info.upper().find('BIND 9.7') != -1:
             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
         else:
@@ -981,7 +985,9 @@
                     "BIND9_9": bind9_9,
                     "BIND9_10": bind9_10,
                     "BIND9_11": bind9_11,
-                    "BIND9_12": bind9_12
+                    "BIND9_12": bind9_12,
+                    "BIND9_14": bind9_14,
+                    "BIND9_15": bind9_15
 
                     })