diff options
| author | Jeremy Allison <jra@samba.org> | 2013-12-03 10:19:09 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-12-09 09:48:48 -0800 |
| commit | 874318a97868e08837a1febb1be8e8a167b5ae0f (patch) | |
| tree | 96916c2c801079db778d23461ebd1585a30f33a1 /source3/smbd | |
| parent | 5b49fe24c906cbae12beff7a1b45de6809258cab (diff) | |
| download | samba-874318a97868e08837a1febb1be8e8a167b5ae0f.tar.gz | |
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 <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/filename.c | 2 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 4 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 10 | ||||
| -rw-r--r-- | source3/smbd/smb2_create.c | 2 | ||||
| -rw-r--r-- | 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 3096a3e5146..eaec5b639e5 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 e901ff27971..1ed22427245 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); @@ -1068,7 +1068,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 ce1a127eb99..aba1d1b64f3 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)) { @@ -2087,7 +2087,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)) { @@ -2320,7 +2320,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)) { @@ -2461,7 +2461,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)) { @@ -5820,7 +5820,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 38eba4f9ceb..74881c6d043 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -892,7 +892,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 */ |