[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  81f71e7 s3:libsmb/async_smb: in cli_state_notify_pending() we always disconnect
       via  13a3aa1 Revert "selftest: Avoid being run over by armies of the undead"
      from  dd64f99 build: explain the passing of make options to waf

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


- Log -----------------------------------------------------------------
commit 81f71e76fd89a36cfa52032fde471220a9fb8218
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Oct 19 14:26:20 2011 +0200

    s3:libsmb/async_smb: in cli_state_notify_pending() we always disconnect
    
    So we should always set state->mid = 0.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Oct 20 11:34:23 CEST 2011 on sn-devel-104

commit 13a3aa13126d537c96f10c22852a813c47f6400e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Oct 18 21:30:17 2011 +1100

    Revert "selftest: Avoid being run over by armies of the undead"
    
    This reverts commit 2b47aface434000b29aa29f4ff6348cc147ae757 because
    it had a typo in $SIG{CHILD} (it needed to be $SIG{CHLD}), which when
    fixed simply broke the whole selftest system.
    
    Andrew Bartlett

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

Summary of changes:
 selftest/selftest.pl       |    2 --
 source3/libsmb/async_smb.c |   12 +++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 5cbb686..78627c8 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -176,8 +176,6 @@ sub pipe_handler {
 
 $SIG{PIPE} = \&pipe_handler;
 
-$SIG{CHILD} = 'IGNORE';
-
 sub find_in_list($$)
 {
 	my ($list, $fullname) = @_;
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index dce1b74..43dfa22 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -287,13 +287,11 @@ static void cli_state_notify_pending(struct cli_state *cli, NTSTATUS status)
 		req = cli->conn.pending[0];
 		state = tevent_req_data(req, struct cli_smb_state);
 
-		if (NT_STATUS_EQUAL(status, NT_STATUS_PIPE_BROKEN)) {
-			/*
-			 * We're dead. No point waiting for trans2
-			 * replies.
-			 */
-			state->mid = 0;
-		}
+		/*
+		 * We're dead. No point waiting for trans2
+		 * replies.
+		 */
+		state->mid = 0;
 
 		cli_smb_req_unset_pending(req);
 


-- 
Samba Shared Repository