summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2015-04-16 22:28:25 +0200
committerKarolin Seeger <kseeger@samba.org>2015-04-28 02:21:24 +0200
commitbfde0f0d73bfcf2c4fc269b44ab04a12e712bb69 (patch)
tree65ad001fe96588d51231c7e16540710cb6ad164e
parent93293071824169944944650a859d832af9d2303b (diff)
downloadsamba-bfde0f0d73bfcf2c4fc269b44ab04a12e712bb69.tar.gz
s3:smbd: missing tevent_req_nterror
The error code path in case fsp == NULL misses a call tevent_req_nterror(). https://bugzilla.samba.org/show_bug.cgi?id=11224 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit ad52dcdf5de6f5f2c2ee156d93ebbb343f39e526)
-rw-r--r--source3/smbd/aio.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index 44d771ebf09..c1e0ce2f10b 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -786,10 +786,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;
}
@@ -959,10 +959,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;
}