]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Convert reply_setatr() to use filename_convert_dirfsp().
authorJeremy Allison <jra@samba.org>
Thu, 28 Jul 2022 17:33:31 +0000 (10:33 -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 f6f05ed861c7a03cfa02748e85d03fee99b7a307..cbe15a1fac63f06d693a867459a6a9ebd248a62b 100644 (file)
@@ -768,12 +768,14 @@ void reply_setatr(struct smb_request *req)
        struct smb_file_time ft;
        connection_struct *conn = req->conn;
        struct smb_filename *smb_fname = NULL;
+       struct files_struct *dirfsp = NULL;
        char *fname = NULL;
        int mode;
        time_t mtime;
        const char *p;
        NTSTATUS status;
        uint32_t ucf_flags = ucf_flags_from_smb_request(req);
+       NTTIME twrp = 0;
        TALLOC_CTX *ctx = talloc_tos();
 
        START_PROFILE(SMBsetatr);
@@ -791,12 +793,16 @@ void reply_setatr(struct smb_request *req)
                goto out;
        }
 
-       status = filename_convert(ctx,
-                               conn,
-                               fname,
-                               ucf_flags,
-                               0,
-                               &smb_fname);
+       if (ucf_flags & UCF_GMT_PATHNAME) {
+               extract_snapshot_token(fname, &twrp);
+       }
+       status = filename_convert_dirfsp(ctx,
+                                        conn,
+                                        fname,
+                                        ucf_flags,
+                                        twrp,
+                                        &dirfsp,
+                                        &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,