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>

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 3096a3e51463f6eeadc005d9ca78bbf9b7c00ee0..eaec5b639e59855153c6c9e2fcd3bbb357ae5fde 100644 (file)
--- 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 e901ff2797194503d3a7716d46a0e1ef5a94e62a..1ed2242724513646d070a1b614892442559ced7d 100644 (file)
--- 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 ce1a127eb9999299b246504f9b43b101cd2f66c7..aba1d1b64f33fcc6aaae06110fdb6a561a5bf6a4 100644 (file)
--- 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 38eba4f9ceb5e2f6fedb7ae99202d4edf25ee761..74881c6d0431e65fcf084f86abe4457b97b3f19d 100644 (file)
--- 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 e76915730d4018f90afbf0b7c90743e8d7af82cd..5cf88bf0c6944a6ea03fdd242e48bfb3f816993c 100644 (file)
--- 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 */