s3: smbd: In smb2_create.c Use ucf_flags variable instead of passing as parameter.
authorJeremy Allison <jra@samba.org>
Tue, 22 Dec 2015 19:08:38 +0000 (11:08 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 23 Dec 2015 02:31:10 +0000 (03:31 +0100)
This will allow us to move lp_posix_pathnames() out of unix_convert()
later.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <rb@sernet.de>
source3/smbd/smb2_create.c

index 1b12962f4575faa279ff84fd443792ba7a053a56..54a598d663d1540137e71fcad134f9bb66974870 100644 (file)
@@ -379,6 +379,7 @@ static NTSTATUS smbd_smb2_create_durable_lease_check(
        const struct smb2_lease *lease_ptr)
 {
        struct smb_filename *smb_fname = NULL;
+       uint32_t ucf_flags = UCF_PREP_CREATEFILE;
        NTSTATUS status;
 
        if (lease_ptr == NULL) {
@@ -404,7 +405,7 @@ static NTSTATUS smbd_smb2_create_durable_lease_check(
        }
 
        status = filename_convert(talloc_tos(), fsp->conn, false,
-                                 requested_filename, UCF_PREP_CREATEFILE,
+                                 requested_filename, ucf_flags,
                                  NULL, &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(10, ("filename_convert returned %s\n",
@@ -1004,6 +1005,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        info = FILE_WAS_OPENED;
                } else {
                        struct smb_filename *smb_fname = NULL;
+                       uint32_t ucf_flags = UCF_PREP_CREATEFILE;
 
                        if (requested_oplock_level == SMB2_OPLOCK_LEVEL_LEASE) {
                                if (lease_ptr == NULL) {
@@ -1031,7 +1033,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                                  smb1req->conn,
                                                  smb1req->flags2 & FLAGS2_DFS_PATHNAMES,
                                                  fname,
-                                                 UCF_PREP_CREATEFILE,
+                                                 ucf_flags,
                                                  NULL, /* ppath_contains_wcards */
                                                  &smb_fname);
                        if (!NT_STATUS_IS_OK(status)) {