[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  00d92f5 s3: libcli: smb1: Ensure we correctly finish a tevent req if the writev fails in the SMB1 case.
      from  77ba781 selftest: mark the samba4.blackbox.dbcheck test as flapping.

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


- Log -----------------------------------------------------------------
commit 00d92f59257ce8fe1729becd72e13a42dfff0589
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 19 10:40:56 2015 -0700

    s3: libcli: smb1: Ensure we correctly finish a tevent req if the writev fails in the SMB1 case.
    
    We haven't added the req to the pending array yet, as SMB1 requests can
    be one-way (no reply needed). So if we error out after the writev, but
    before we add to the pending array we must rember to terminate our current
    tevent req with a tevent_req_nterror call.
    
    Fixes bug 11173 - SMB1 Server disconnect can cause timeout on client write error.
    
    https://bugzilla.samba.org/show_bug.cgi?id=11173
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Fri Mar 20 05:08:25 CET 2015 on sn-devel-104

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

Summary of changes:
 libcli/smb/smbXcli_base.c | 1 +
 1 file changed, 1 insertion(+)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 5773ab3..9f73566 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -1613,6 +1613,7 @@ static void smb1cli_req_writev_done(struct tevent_req *subreq)
 	if (nwritten == -1) {
 		NTSTATUS status = map_nt_error_from_unix_common(err);
 		smbXcli_conn_disconnect(state->conn, status);
+		tevent_req_nterror(req, status);
 		return;
 	}
 


-- 
Samba Shared Repository