[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  64b038d s3:smbd: update comment to correctly reflect MS-SMB2
       via  ad52dcd s3:smbd: missing tevent_req_nterror
      from  6b1f757 s3:lib: use talloc_get_type_abort

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


- Log -----------------------------------------------------------------
commit 64b038da31c7674410ef770f9c40a5402159fb57
Author: Ralph Boehme <slow at samba.org>
Date:   Fri Apr 17 09:12:59 2015 +0200

    s3:smbd: update comment to correctly reflect MS-SMB2
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Apr 22 01:04:02 CEST 2015 on sn-devel-104

commit ad52dcdf5de6f5f2c2ee156d93ebbb343f39e526
Author: Ralph Boehme <slow at samba.org>
Date:   Thu Apr 16 22:28:25 2015 +0200

    s3:smbd: missing tevent_req_nterror
    
    The error code path in case fsp == NULL misses a call
    tevent_req_nterror().
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/smbd/aio.c         | 12 ++++++------
 source3/smbd/smb2_server.c | 11 +++++------
 2 files changed, 11 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index e2306a9..253782b 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -789,10 +789,10 @@ static void aio_pread_smb2_done(struct tevent_req *req)
 		   (nread == -1) ? strerror(err) : "no error"));
 
 	if (fsp == NULL) {
-		DEBUG( 3, ("aio_pread_smb2_done: file closed whilst "
-			   "aio outstanding (mid[%llu]).\n",
-			   (unsigned long long)aio_ex->smbreq->mid));
+		DEBUG(3, ("%s: request cancelled (mid[%ju])\n",
+			  __func__, (uintmax_t)aio_ex->smbreq->mid));
 		TALLOC_FREE(aio_ex);
+		tevent_req_nterror(subreq, NT_STATUS_INTERNAL_ERROR);
 		return;
 	}
 
@@ -962,10 +962,10 @@ static void aio_pwrite_smb2_done(struct tevent_req *req)
 		   (nwritten == -1) ? strerror(err) : "no error"));
 
 	if (fsp == NULL) {
-		DEBUG( 3, ("aio_pwrite_smb2_done: file closed whilst "
-			   "aio outstanding (mid[%llu]).\n",
-			   (unsigned long long)aio_ex->smbreq->mid));
+		DEBUG(3, ("%s: request cancelled (mid[%ju])\n",
+			  __func__, (uintmax_t)aio_ex->smbreq->mid));
 		TALLOC_FREE(aio_ex);
+		tevent_req_nterror(subreq, NT_STATUS_INTERNAL_ERROR);
 		return;
 	}
 
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 8725ef2..42a809b 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1347,12 +1347,11 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
 
 	if (req->in.vector_count > req->current_idx + SMBD_SMB2_NUM_IOV_PER_REQ) {
 		/*
-		 * We're trying to go async in a compound
-		 * request chain.
-		 * This is only allowed for opens that
-		 * cause an oplock break, otherwise it
-		 * is not allowed. See [MS-SMB2].pdf
-		 * note <194> on Section 3.3.5.2.7.
+		 * We're trying to go async in a compound request
+		 * chain. This is only allowed for opens that cause an
+		 * oplock break or for the last operation in the
+		 * chain, otherwise it is not allowed. See
+		 * [MS-SMB2].pdf note <206> on Section 3.3.5.2.7.
 		 */
 		const uint8_t *inhdr = SMBD_SMB2_IN_HDR_PTR(req);
 


-- 
Samba Shared Repository