[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  bbb1887 Avoid segfault in durable_open tests
       via  26a7372 Always use Samba's CHECK_CFG instead of waf check_cfg
       via  21f98e5 Remove PYTHONDIR and PYTHONARCHDIR in a single place
      from  e2c4b89 s3: smbd: Use separate flag to track become_root()/unbecome_root() state.

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


- Log -----------------------------------------------------------------
commit bbb18875dcd92f1691a1ab0aa1400b73609cb111
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Wed Jun 24 11:47:31 2015 +1200

    Avoid segfault in durable_open tests
    
    There are "goto done"s hiding in CHECK_STATUS in parts of
    the code where tree1 is unequivocally NULL.
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Fri Jun 26 05:12:02 CEST 2015 on sn-devel-104

commit 26a7372e3ba2de0407b172599a83c6ff0fee9702
Author: Thomas Nagy <tnagy2pow10 at gmail.com>
Date:   Thu Jun 18 23:46:04 2015 +0200

    Always use Samba's CHECK_CFG instead of waf check_cfg

commit 21f98e58da01c6be761515b46780dbec3a0efe26
Author: Thomas Nagy <tnagy2pow10 at gmail.com>
Date:   Thu Jun 18 23:45:11 2015 +0200

    Remove PYTHONDIR and PYTHONARCHDIR in a single place

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

Summary of changes:
 buildtools/wafsamba/samba_bundled.py |  2 +-
 buildtools/wafsamba/samba_python.py  |  4 ++++
 ctdb/wscript                         |  3 ---
 source4/torture/smb2/durable_open.c  | 10 ++++++----
 wscript                              |  5 -----
 5 files changed, 11 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 515590f..c8bfcd2 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -190,7 +190,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
         pkg = libname
 
     # try pkgconfig first
-    if (conf.check_cfg(package=pkg,
+    if (conf.CHECK_CFG(package=pkg,
                       args='"%s >= %s" --cflags --libs' % (pkg, minversion),
                       msg=msg, uselib_store=uselib_store) and
         check_functions_headers_code()):
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index fb378ae..7546bbd 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -55,6 +55,10 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True):
     else:
         conf.msg("python headers", "using cache")
 
+    # we don't want PYTHONDIR in config.h, as otherwise changing
+    # --prefix causes a complete rebuild
+    del(conf.env.defines['PYTHONDIR'])
+    del(conf.env.defines['PYTHONARCHDIR'])
 
 def _check_python_headers(conf, mandatory):
     conf.check_python_headers(mandatory=mandatory)
diff --git a/ctdb/wscript b/ctdb/wscript
index b5c6087..9561750 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -212,9 +212,6 @@ def configure(conf):
             conf.ADD_EXTRA_INCLUDES('#ctdb')
         conf.ADD_EXTRA_INCLUDES('#lib #lib/replace')
 
-        del(conf.env.defines['PYTHONDIR'])
-        del(conf.env.defines['PYTHONARCHDIR'])
-
         conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
         conf.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True)
         conf.SAMBA_CONFIG_H()
diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index fd6af33..bb32f96 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -2136,12 +2136,14 @@ static bool test_durable_open_open2_lease(struct torture_context *tctx,
 	h1 = io1.out.file.handle;
 
  done:
+	if (tree1 != NULL){
+		smb2_util_close(tree1, h1);
+		smb2_util_unlink(tree1, fname);
+		talloc_free(tree1);
+	}
+
 	smb2_util_close(tree2, h2);
 	smb2_util_unlink(tree2, fname);
-	smb2_util_close(tree1, h1);
-	smb2_util_unlink(tree1, fname);
-
-	talloc_free(tree1);
 	talloc_free(tree2);
 
 	return ret;
diff --git a/wscript b/wscript
index 7700c32..a84e5d5 100644
--- a/wscript
+++ b/wscript
@@ -172,11 +172,6 @@ def configure(conf):
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)
 
-    # we don't want PYTHONDIR in config.h, as otherwise changing
-    # --prefix causes a complete rebuild
-    del(conf.env.defines['PYTHONDIR'])
-    del(conf.env.defines['PYTHONARCHDIR'])
-
     if not conf.CHECK_CODE('#include "tests/summary.c"',
                            define='SUMMARY_PASSES',
                            addmain=False,


-- 
Samba Shared Repository