[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  8807ad1 dynconfig: Fix deps, no talloc required
       via  b5cf80a talloc: Fix the O3 developer build
      from  2f7bee4 wbinfo: make --verbose --pam-logon print sids

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


- Log -----------------------------------------------------------------
commit 8807ad18c2cc1a0cdc4f47c294d44123d2a53ec8
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 12 12:17:56 2015 +0200

    dynconfig: Fix deps, no talloc required
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Mon Oct 12 17:06:04 CEST 2015 on sn-devel-104

commit b5cf80a7b58095fd711968ef03f84740d0119553
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 12 12:06:50 2015 +0200

    talloc: Fix the O3 developer build
    
    Compilers can't see that the child exits. Thus "exit_status" is
    used uninitialized in the child.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 dynconfig/wscript      | 2 +-
 lib/talloc/testsuite.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/dynconfig/wscript b/dynconfig/wscript
index 6410c38..606fbad 100755
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -412,7 +412,7 @@ def build(bld):
     version_header = 'version.h'
     bld.SAMBA_SUBSYSTEM('DYNCONFIG',
                         'dynconfig.c',
-                        deps='replace talloc',
+                        deps='replace',
                         public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
                         header_path='samba',
                         cflags=cflags)
diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c
index 9f83039..34410b8 100644
--- a/lib/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
@@ -1895,10 +1895,13 @@ static bool test_magic_protection(void)
 
 		/* Then the attack takes effect when the memory's freed. */
 		talloc_free(pool);
-	} else {
-		while (wait(&exit_status) != pid);
+
+		/* Never reached. Make compilers happy */
+		return true;
 	}
 
+	while (wait(&exit_status) != pid);
+
 	if (!WIFEXITED(exit_status)) {
 		printf("Child exited through unexpected abnormal means\n");
 		return false;


-- 
Samba Shared Repository