Attachment 14055 Details for Bug 13338 – git-am fix for 4.8.next, 4.7.next, 4.6.next.

[patch] git-am fix for 4.8.next, 4.7.next, 4.6.next.

0001-s3-smbd-map-nterror-on-smb2_flush-errorpath.patch (text/plain), 1.21 KB, created by Jeremy Allison on 2018-03-16 21:08:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2018-03-16 21:08:35 UTC

Size: 1.21 KB

patch

obsolete

>From ec3df07b77406070bf4e74035849c42a8ed10e0a Mon Sep 17 00:00:00 2001
>From: Anton Nefedov via samba-technical <samba-technical@lists.samba.org>
>Date: Thu, 15 Mar 2018 14:38:41 +0300
>Subject: [PATCH] s3:smbd: map nterror on smb2_flush errorpath
>
>smbd_smb2_flush_recv() expects nterror in tevent_req, and otherwise
>aborts in tevent_req_is_nterror()
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13338
>
>Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 98623129446672521b7fa41d3457b8ce95db828c)
>---
> source3/smbd/smb2_flush.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/smbd/smb2_flush.c b/source3/smbd/smb2_flush.c
>index d077c62c403..51584ca876f 100644
>--- a/source3/smbd/smb2_flush.c
>+++ b/source3/smbd/smb2_flush.c
>@@ -198,7 +198,7 @@ static void smbd_smb2_flush_done(struct tevent_req *subreq)
> 	ret = SMB_VFS_FSYNC_RECV(subreq, &vfs_aio_state);
> 	TALLOC_FREE(subreq);
> 	if (ret == -1) {
>-		tevent_req_error(req, vfs_aio_state.error);
>+		tevent_req_nterror(req, map_nt_error_from_unix(vfs_aio_state.error));
> 		return;
> 	}
> 	tevent_req_done(req);
>-- 
>2.16.2.804.g6dcf76e118-goog
>

Flags:

vl: review+

Actions: View

Attachments on bug 13338: 14055