[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  1a86733 provision: Add support for BIND 9.12.x
       via  94ffd4b dlz-bind: Add support for BIND 9.12.x
      from  9c13125 s3/smbd: Ensure quota code is only called when quota support detected

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1a86733d034019083cadb137cb81dba661f96b66
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Aug 8 19:44:38 2018 +1000

    provision: Add support for BIND 9.12.x
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Fri Aug 10 05:36:19 CEST 2018 on sn-devel-144

commit 94ffd4b7ad6680d0352d5cbdcda7dd61fd981809
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Aug 8 19:43:03 2018 +1000

    dlz-bind: Add support for BIND 9.12.x
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 python/samba/provision/sambadns.py |  6 +++++-
 source4/dns_server/dlz_minimal.h   |  3 +++
 source4/dns_server/wscript_build   | 10 ++++++++++
 source4/setup/named.conf.dlz       |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index e2b6fcd..a04d8b8 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -953,6 +953,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
         bind9_9 = '#'
         bind9_10 = '#'
         bind9_11 = '#'
+        bind9_12 = '#'
         if bind_info.upper().find('BIND 9.8') != -1:
             bind9_8 = ''
         elif bind_info.upper().find('BIND 9.9') != -1:
@@ -961,6 +962,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
             bind9_10 = ''
         elif bind_info.upper().find('BIND 9.11') != -1:
             bind9_11 = ''
+        elif bind_info.upper().find('BIND 9.12') != -1:
+            bind9_12 = ''
         elif bind_info.upper().find('BIND 9.7') != -1:
             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
         else:
@@ -971,7 +974,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
                     "BIND9_8" : bind9_8,
                     "BIND9_9" : bind9_9,
                     "BIND9_10" : bind9_10,
-                    "BIND9_11" : bind9_11
+                    "BIND9_11" : bind9_11,
+                    "BIND9_12" : bind9_12
                     })
 
 
diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h
index 89ada7a..193904f 100644
--- a/source4/dns_server/dlz_minimal.h
+++ b/source4/dns_server/dlz_minimal.h
@@ -34,6 +34,9 @@
 #elif defined (BIND_VERSION_9_11)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 2
+#elif defined (BIND_VERSION_9_12)
+# define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 2
 #else
 # error Unsupported BIND version
 #endif
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index c01e618..0fd6aa8 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -58,6 +58,16 @@ bld.SAMBA_LIBRARY('dlz_bind9_11',
                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
 
+bld.SAMBA_LIBRARY('dlz_bind9_12',
+                  source='dlz_bind9.c',
+                  cflags='-DBIND_VERSION_9_12',
+                  private_library=True,
+                  link_name='modules/bind9/dlz_bind9_12.so',
+                  realname='dlz_bind9_12.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 215af5a..9341d7e 100644
--- a/source4/setup/named.conf.dlz
+++ b/source4/setup/named.conf.dlz
@@ -21,5 +21,8 @@ dlz "AD DNS Zone" {
 
     # For BIND 9.11.x
     ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so";
+
+    # For BIND 9.12.x
+    ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
 };
 


-- 
Samba Shared Repository