[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  df27ba3 s4:librpc/rpc: directly return after composite_error()
       via  dcf82e5 s4:libnet_become_dc: add missing 'return' after composite_error()
      from  9ea9ad2 selftest: Add test for bug #8884: wbinfo --group-info=administrator segfaults s4-winbindd

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


- Log -----------------------------------------------------------------
commit df27ba3e8b8a96c64b3966f2474391e5ec3cdec1
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Apr 23 09:23:08 2012 +0200

    s4:librpc/rpc: directly return after composite_error()
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Apr 23 12:17:08 CEST 2012 on sn-devel-104

commit dcf82e5869c885c1e62c4d317bb466a82cee249f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Apr 23 09:22:18 2012 +0200

    s4:libnet_become_dc: add missing 'return' after composite_error()
    
    metze

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

Summary of changes:
 source4/libnet/libnet_become_dc.c |    2 ++
 source4/librpc/rpc/dcerpc_sock.c  |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index c7d0b30..28bb5a1 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -2395,6 +2395,7 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 				 "method succeeded but objects returned are %d (expected 1).\n",
 				 r->out.ctr->ctr3.count));
 			composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+			return;
 		}
 
 		s->dest_dsa.ntds_guid	= r->out.ctr->ctr3.objects[0].guid;
@@ -2416,6 +2417,7 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 				 r->out.ctr->ctr2.dir_err,
 				 win_errstr(r->out.ctr->ctr2.extended_err)));
 			composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+			return;
 		}
 
 		s->dest_dsa.ntds_guid	= r->out.ctr->ctr2.objects[0].guid;
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index a291996..58fca4c 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -283,8 +283,8 @@ static void continue_socket_connect(struct composite_context *ctx)
 
 	sock->packet = packet_init(sock);
 	if (sock->packet == NULL) {
-		composite_error(c, NT_STATUS_NO_MEMORY);
 		talloc_free(sock);
+		composite_error(c, NT_STATUS_NO_MEMORY);
 		return;
 	}
 


-- 
Samba Shared Repository