[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  d1c96dc messaging: Avoid a socket leak after fork
      from  587bdfe ctdb-protocol: Fix CID 1417428

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


- Log -----------------------------------------------------------------
commit d1c96dc0ac95322ce46703a11002873faf55a26c
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Aug 30 17:49:54 2017 +0200

    messaging: Avoid a socket leak after fork
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=13006
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Sep  5 19:12:34 CEST 2017 on sn-devel-144

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

Summary of changes:
 source3/lib/messages_dgm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c
index f29180d..9d87746 100644
--- a/source3/lib/messages_dgm.c
+++ b/source3/lib/messages_dgm.c
@@ -280,7 +280,8 @@ static int messaging_dgm_out_destructor(struct messaging_dgm_out *out)
 {
 	DLIST_REMOVE(out->ctx->outsocks, out);
 
-	if (tevent_queue_length(out->queue) != 0) {
+	if ((tevent_queue_length(out->queue) != 0) &&
+	    (getpid() == out->ctx->pid)) {
 		/*
 		 * We have pending jobs. We can't close the socket,
 		 * this has been handed over to messaging_dgm_out_queue_state.


-- 
Samba Shared Repository