[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  6de9d87 python/samba/tests: make sure samba.tests can be imported without SamDB
       via  1faaeb0 s4-dsdb: only build dsdb Python modules for AD DC
       via  2114768 s4-dns_server: Only build dns server Python code for AD DC
      from  582ce5d s3: smbd: Fix AIX sendfile() for SMB2. Ensure we don't spin on EAGAIN.

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


- Log -----------------------------------------------------------------
commit 6de9d878b5f63e5b5ac7f8b5dd2ca50e4ba8fa1a
Author: Alexander Bokovoy <ab at samba.org>
Date:   Sat Jul 21 12:05:15 2018 +0300

    python/samba/tests: make sure samba.tests can be imported without SamDB
    
    We are using samba.tests Python module __init__.py file as a catch-all
    for all types of helpers. Some of these helpers are only usable with
    Samba AD DC targets.
    
    When SamDB is not available in a non-Samba AD DC target, provide a
    dummy replacement that simply returns None. This allows to complete
    initialization for non-Samba AD DC target tests which do not use
    connect_samdb() helper.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13542
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Mon Jul 23 19:36:56 CEST 2018 on sn-devel-144

commit 1faaeb00b5b8217c7a2cb145673ceba847b94cf2
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jul 20 12:32:20 2018 +0300

    s4-dsdb: only build dsdb Python modules for AD DC
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13542
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

commit 2114768a8e64647e4f429e0b4e464e0cfc056feb
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jul 20 12:31:20 2018 +0300

    s4-dns_server: Only build dns server Python code for AD DC
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13542
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

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

Summary of changes:
 python/samba/tests/__init__.py   |  7 ++++++-
 source4/dns_server/wscript_build |  8 +++++---
 source4/dsdb/wscript_build       | 11 +++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 1d50710..dcee691 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -38,7 +38,12 @@ import samba.dcerpc.base
 from samba.compat import PY3, text_type
 from samba.compat import string_types
 from random import randint
-from samba.samdb import SamDB
+try:
+    from samba.samdb import SamDB
+except ImportError:
+    # We are built without samdb support,
+    # imitate it so that connect_samdb() can recover
+    SamDB = lambda *x: None
 import samba.ndr
 import samba.dcerpc.dcerpc
 import samba.dcerpc.epmapper
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index c24f455..c01e618 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -71,6 +71,8 @@ for env in bld.gen_python_environments():
     pytalloc_util = bld.pyembed_libname('pytalloc-util')
 
     bld.SAMBA_PYTHON('python_dsdb_dns',
-	         source='pydns.c',
-	         deps='samdb %s %s dnsserver_common %s' % (pyldb_util, pyrpc_util, pytalloc_util),
-	         realname='samba/dsdb_dns.so')
+                     source='pydns.c',
+                     deps='samdb %s %s dnsserver_common %s' % (
+                         pyldb_util, pyrpc_util, pytalloc_util),
+                     realname='samba/dsdb_dns.so',
+                     enabled=bld.AD_DC_BUILD_IS_ENABLED())
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index be99e99..34ba8ed 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -40,12 +40,14 @@ bld.SAMBA_MODULE('service_drepl',
 bld.SAMBA_LIBRARY('dsdb_garbage_collect_tombstones',
                   source='kcc/garbage_collect_tombstones.c',
                   deps='samdb RPC_NDR_DRSUAPI',
-                  private_library=True)
+                  private_library=True,
+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
 
 bld.SAMBA_LIBRARY('scavenge_dns_records',
                   source='kcc/scavenge_dns_records.c',
                   deps='samdb RPC_NDR_DRSUAPI dnsserver_common',
-                  private_library=True)
+                  private_library=True,
+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
 
 bld.SAMBA_MODULE('service_kcc',
 	source='kcc/kcc_service.c kcc/kcc_connection.c kcc/kcc_periodic.c kcc/kcc_drs_replica_info.c',
@@ -78,5 +80,6 @@ for env in bld.gen_python_environments():
 		# removes it so we end up with unresolved symbols.
 		deps='samdb %s dcerpc com_err %s %s dsdb_garbage_collect_tombstones scavenge_dns_records' %\
 			 (pyldb_util, pyrpc_util, pyparam_util),
-		realname='samba/dsdb.so'
-		)
+		realname='samba/dsdb.so',
+                enabled=bld.AD_DC_BUILD_IS_ENABLED()
+                )


-- 
Samba Shared Repository