[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  9c69a23 s3: Make us survive smb2.lock.rw-shared with aio enabled
      from  ceed322 Fix bug #9034 - Typo in set_re_uid() call when USE_SETRESUID selected in configure.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 9c69a2359107b7c31feb03b9971e08645205e400
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jul 13 08:38:07 2012 +0200

    s3: Make us survive smb2.lock.rw-shared with aio enabled
    
    schedule_aio_smb2_write can return NT_STATUS_FILE_LOCK_CONFLICT.
    This is a valid error code that smb2.lock.rw-shared expects and
    checks for. The code before this patch maps this to NT_STATUS_FILE_CLOSED,
    masking the real, correct error message.
    
    Fix bug #9040 - Using asynchronous IO with SMB2 can return NT_STATUS_FILE_CLOSED
    in error instead ofNT_STATUS_FILE_LOCK_CONFLICT.

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

Summary of changes:
 source3/smbd/smb2_write.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index a8e5ec3..5aeed8c 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -298,7 +298,7 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
 
 	if (!NT_STATUS_EQUAL(status, NT_STATUS_RETRY)) {
 		/* Real error in setting up aio. Fail. */
-		tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+		tevent_req_nterror(req, status);
 		return tevent_req_post(req, ev);
 	}
 


-- 
Samba Shared Repository