[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  40258f5 smbd: Fix a valgrind error
      from  600cec4 ctdb-recovery: Terminate if recovery fails without any banning credits

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


- Log -----------------------------------------------------------------
commit 40258f5df1a86d30e265974604cbd77685c18a2a
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 24 07:27:43 2016 +0200

    smbd: Fix a valgrind error
    
    "child" has been free'd via "tmp"
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Jun 24 14:07:56 CEST 2016 on sn-devel-144

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

Summary of changes:
 source3/smbd/server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 24acc04..cdcdcc2 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -577,7 +577,7 @@ static void remove_child_pid(struct smbd_parent_context *parent,
 		return;
 	}
 
-	if (child->pid == procid_to_pid(&parent->cleanupd)) {
+	if (pid == procid_to_pid(&parent->cleanupd)) {
 		bool ok;
 
 		DBG_WARNING("Restarting cleanupd\n");


-- 
Samba Shared Repository