]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Convert reply_mkdir() to use filename_convert_dirfsp().
authorJeremy Allison <jra@samba.org>
Thu, 28 Jul 2022 19:04:47 +0000 (12:04 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 2 Aug 2022 19:49:32 +0000 (19:49 +0000)
One less use of filename_convert().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
source3/smbd/smb1_reply.c

index 440283c20846f6b235a69192cf64da34b10e89d7..6e8a3c0846b61dc9be805b7a6f18a0b9452ba547 100644 (file)
@@ -5814,10 +5814,12 @@ void reply_printwrite(struct smb_request *req)
 void reply_mkdir(struct smb_request *req)
 {
        connection_struct *conn = req->conn;
+       struct files_struct *dirfsp = NULL;
        struct smb_filename *smb_dname = NULL;
        char *directory = NULL;
        NTSTATUS status;
        uint32_t ucf_flags;
+       NTTIME twrp = 0;
        TALLOC_CTX *ctx = talloc_tos();
 
        START_PROFILE(SMBmkdir);
@@ -5830,11 +5832,16 @@ void reply_mkdir(struct smb_request *req)
        }
 
        ucf_flags = filename_create_ucf_flags(req, FILE_CREATE);
-       status = filename_convert(ctx, conn,
-                                directory,
-                                ucf_flags,
-                                0,
-                                &smb_dname);
+       if (ucf_flags & UCF_GMT_PATHNAME) {
+               extract_snapshot_token(directory, &twrp);
+       }
+       status = filename_convert_dirfsp(ctx,
+                                        conn,
+                                        directory,
+                                        ucf_flags,
+                                        twrp,
+                                        &dirfsp,
+                                        &smb_dname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
@@ -5845,7 +5852,7 @@ void reply_mkdir(struct smb_request *req)
                goto out;
        }
 
-       status = create_directory(conn, req, NULL, smb_dname);
+       status = create_directory(conn, req, dirfsp, smb_dname);
 
        DEBUG(5, ("create_directory returned %s\n", nt_errstr(status)));