From b1fb353db8a95a7140c79984bf9b3f1178945b5f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 3 Dec 2013 10:19:09 -0800 Subject: [PATCH] smbd: change flag name from UCF_CREATING_FILE to UCF_PREP_CREATEFILE In preparation to using it for all open calls. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10297 Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke (cherry picked from commit 874318a97868e08837a1febb1be8e8a167b5ae0f) --- source3/smbd/filename.c | 2 +- source3/smbd/nttrans.c | 4 ++-- source3/smbd/reply.c | 10 +++++----- source3/smbd/smb2_create.c | 2 +- source3/smbd/smbd.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 16d0df1b089..ba419865175 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -722,7 +722,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, */ if (errno == EACCES) { - if ((ucf_flags & UCF_CREATING_FILE) == 0) { + if ((ucf_flags & UCF_PREP_CREATEFILE) == 0) { status = NT_STATUS_ACCESS_DENIED; goto fail; } else { diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index b7dfa8c8186..15fa4b64776 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -539,7 +539,7 @@ void reply_ntcreate_and_X(struct smb_request *req) req->flags2 & FLAGS2_DFS_PATHNAMES, fname, (create_disposition == FILE_CREATE) - ? UCF_CREATING_FILE : 0, + ? UCF_PREP_CREATEFILE : 0, NULL, &smb_fname); @@ -1119,7 +1119,7 @@ static void call_nt_transact_create(connection_struct *conn, req->flags2 & FLAGS2_DFS_PATHNAMES, fname, (create_disposition == FILE_CREATE) - ? UCF_CREATING_FILE : 0, + ? UCF_PREP_CREATEFILE : 0, NULL, &smb_fname); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 2d729ece3b1..2c9749e74fc 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1918,7 +1918,7 @@ void reply_open(struct smb_request *req) req->flags2 & FLAGS2_DFS_PATHNAMES, fname, (create_disposition == FILE_CREATE) - ? UCF_CREATING_FILE : 0, + ? UCF_PREP_CREATEFILE : 0, NULL, &smb_fname); if (!NT_STATUS_IS_OK(status)) { @@ -2096,7 +2096,7 @@ void reply_open_and_X(struct smb_request *req) req->flags2 & FLAGS2_DFS_PATHNAMES, fname, (create_disposition == FILE_CREATE) - ? UCF_CREATING_FILE : 0, + ? UCF_PREP_CREATEFILE : 0, NULL, &smb_fname); if (!NT_STATUS_IS_OK(status)) { @@ -2329,7 +2329,7 @@ void reply_mknew(struct smb_request *req) conn, req->flags2 & FLAGS2_DFS_PATHNAMES, fname, - UCF_CREATING_FILE, + UCF_PREP_CREATEFILE, NULL, &smb_fname); if (!NT_STATUS_IS_OK(status)) { @@ -2470,7 +2470,7 @@ void reply_ctemp(struct smb_request *req) status = filename_convert(ctx, conn, req->flags2 & FLAGS2_DFS_PATHNAMES, fname, - UCF_CREATING_FILE, + UCF_PREP_CREATEFILE, NULL, &smb_fname); if (!NT_STATUS_IS_OK(status)) { @@ -5829,7 +5829,7 @@ void reply_mkdir(struct smb_request *req) status = filename_convert(ctx, conn, req->flags2 & FLAGS2_DFS_PATHNAMES, directory, - UCF_CREATING_FILE, + UCF_PREP_CREATEFILE, NULL, &smb_dname); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index c4d49913a7b..f637dac0c80 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -872,7 +872,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx, smb1req->flags2 & FLAGS2_DFS_PATHNAMES, fname, (in_create_disposition == FILE_CREATE) ? - UCF_CREATING_FILE : 0, + UCF_PREP_CREATEFILE : 0, NULL, /* ppath_contains_wcards */ &smb_fname); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h index e76915730d4..5cf88bf0c69 100644 --- a/source3/smbd/smbd.h +++ b/source3/smbd/smbd.h @@ -73,6 +73,6 @@ struct trans_state { #define UCF_COND_ALLOW_WCARD_LCOMP 0x00000004 #define UCF_POSIX_PATHNAMES 0x00000008 #define UCF_UNIX_NAME_LOOKUP 0x00000010 -#define UCF_CREATING_FILE 0x00000020 +#define UCF_PREP_CREATEFILE 0x00000020 #endif /* _SMBD_SMBD_H */ -- 2.11.4.GIT