From fe04555152e382554356b3f4f754e37bdf83a83c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 3 Dec 2013 10:21:16 -0800 Subject: [PATCH] smbd: Always use UCF_PREP_CREATEFILE for filename_convert calls to resolve a path for open. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10297 Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Mon Dec 9 21:02:21 CET 2013 on sn-devel-104 (cherry picked from commit f98d10af2a05f0261611f4cabdfe274cd9fe91c0) --- source3/smbd/nttrans.c | 6 ++---- source3/smbd/reply.c | 6 ++---- source3/smbd/smb2_create.c | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 15fa4b64776..0d3cd079980 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -538,8 +538,7 @@ void reply_ntcreate_and_X(struct smb_request *req) conn, req->flags2 & FLAGS2_DFS_PATHNAMES, fname, - (create_disposition == FILE_CREATE) - ? UCF_PREP_CREATEFILE : 0, + UCF_PREP_CREATEFILE, NULL, &smb_fname); @@ -1118,8 +1117,7 @@ static void call_nt_transact_create(connection_struct *conn, conn, req->flags2 & FLAGS2_DFS_PATHNAMES, fname, - (create_disposition == FILE_CREATE) - ? UCF_PREP_CREATEFILE : 0, + UCF_PREP_CREATEFILE, NULL, &smb_fname); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 2c9749e74fc..f293b69f0b2 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1917,8 +1917,7 @@ void reply_open(struct smb_request *req) conn, req->flags2 & FLAGS2_DFS_PATHNAMES, fname, - (create_disposition == FILE_CREATE) - ? UCF_PREP_CREATEFILE : 0, + UCF_PREP_CREATEFILE, NULL, &smb_fname); if (!NT_STATUS_IS_OK(status)) { @@ -2095,8 +2094,7 @@ void reply_open_and_X(struct smb_request *req) conn, req->flags2 & FLAGS2_DFS_PATHNAMES, fname, - (create_disposition == FILE_CREATE) - ? UCF_PREP_CREATEFILE : 0, + UCF_PREP_CREATEFILE, NULL, &smb_fname); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index f637dac0c80..6730ad6a7b2 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -871,8 +871,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx, smb1req->conn, smb1req->flags2 & FLAGS2_DFS_PATHNAMES, fname, - (in_create_disposition == FILE_CREATE) ? - UCF_PREP_CREATEFILE : 0, + UCF_PREP_CREATEFILE, NULL, /* ppath_contains_wcards */ &smb_fname); if (!NT_STATUS_IS_OK(status)) { -- 2.11.4.GIT