[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  16ea6e1 talloc: fix TALLOC_VERSION_* mismatch detection
       via  cad2362 script/autobuild.py: ignore missing test_tmpdir
      from  10e1b92 krb5_wrap: use our own code to calculate the ENCTYPE_ARCFOUR_HMAC key

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


- Log -----------------------------------------------------------------
commit 16ea6e1308a7d94a501d002ed53529f6d754e940
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 14 12:33:32 2017 +0100

    talloc: fix TALLOC_VERSION_* mismatch detection
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Feb 22 00:14:34 CET 2017 on sn-devel-144

commit cad23629ac48253e508fd9bead2bb79bfa7ee3b8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 21 17:05:08 2017 +0100

    script/autobuild.py: ignore missing test_tmpdir
    
    It is still unknown what removes it...
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 lib/talloc/talloc.c | 11 ++++-------
 lib/talloc/talloc.h |  2 +-
 lib/talloc/wscript  |  4 ++++
 script/autobuild.py |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index 8bdd4b6..7721fa4 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -37,17 +37,13 @@
 #include <sys/auxv.h>
 #endif
 
-#ifdef TALLOC_BUILD_VERSION_MAJOR
 #if (TALLOC_VERSION_MAJOR != TALLOC_BUILD_VERSION_MAJOR)
 #error "TALLOC_VERSION_MAJOR != TALLOC_BUILD_VERSION_MAJOR"
 #endif
-#endif
 
-#ifdef TALLOC_BUILD_VERSION_MINOR
 #if (TALLOC_VERSION_MINOR != TALLOC_BUILD_VERSION_MINOR)
 #error "TALLOC_VERSION_MINOR != TALLOC_BUILD_VERSION_MINOR"
 #endif
-#endif
 
 /* Special macros that are no-ops except when run under Valgrind on
  * x86.  They've moved a little bit from valgrind 1.0.4 to 1.9.4 */
@@ -82,8 +78,9 @@
 static unsigned int talloc_magic = (
 	~TALLOC_FLAG_MASK & (
 		TALLOC_MAGIC_BASE +
-		(TALLOC_VERSION_MAJOR << 12) +
-		(TALLOC_VERSION_MINOR << 4)));
+		(TALLOC_BUILD_VERSION_MAJOR << 24) +
+		(TALLOC_BUILD_VERSION_MINOR << 16) +
+		(TALLOC_BUILD_VERSION_RELEASE << 8)));
 
 /* by default we abort when given a bad pointer (such as when talloc_free() is called
    on a pointer that came from malloc() */
@@ -453,7 +450,7 @@ static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr)
 	const char *pp = (const char *)ptr;
 	struct talloc_chunk *tc = discard_const_p(struct talloc_chunk, pp - TC_HDR_SIZE);
 	if (unlikely((tc->flags & (TALLOC_FLAG_FREE | ~TALLOC_FLAG_MASK)) != talloc_magic)) {
-		if ((tc->flags & (~0xF)) == talloc_magic) {
+		if ((tc->flags & (~TALLOC_FLAG_MASK)) == talloc_magic) {
 			talloc_abort_magic(tc->flags & (~TALLOC_FLAG_MASK));
 			return NULL;
 		}
diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index b0917b5..227f745 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -43,7 +43,7 @@ extern "C" {
  */
 
 #define TALLOC_VERSION_MAJOR 2
-#define TALLOC_VERSION_MINOR 0
+#define TALLOC_VERSION_MINOR 1
 
 int talloc_version_major(void);
 int talloc_version_minor(void);
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 8ce4f59..d77de26 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -42,6 +42,10 @@ def configure(conf):
 
     conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
 
+    conf.define('TALLOC_BUILD_VERSION_MAJOR', int(VERSION.split('.')[0]))
+    conf.define('TALLOC_BUILD_VERSION_MINOR', int(VERSION.split('.')[1]))
+    conf.define('TALLOC_BUILD_VERSION_RELEASE', int(VERSION.split('.')[2]))
+
     conf.env.disable_python = getattr(Options.options, 'disable_python', False)
 
     if not conf.env.standalone_talloc:
diff --git a/script/autobuild.py b/script/autobuild.py
index f1d48c4..76b70fd 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -455,7 +455,7 @@ class buildlist(object):
 def cleanup():
     if options.nocleanup:
         return
-    run_cmd("stat %s" % test_tmpdir, show=True)
+    run_cmd("stat %s || true" % test_tmpdir, show=True)
     run_cmd("stat %s" % testbase, show=True)
     do_print("Cleaning up ....")
     for d in cleanup_list:


-- 
Samba Shared Repository