s3: smbd: Cleanup. smb2_file_rename_information() can never have a @GMT path in the...
authorJeremy Allison <jra@samba.org>
Mon, 27 Mar 2023 17:43:55 +0000 (10:43 -0700)
committerRalph Boehme <slow@samba.org>
Fri, 31 Mar 2023 05:12:32 +0000 (05:12 +0000)
That's an SMB1 thing. It will always be (and always was) zero.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/smb2_trans2.c

index 2ed3745347f0a5e9f6fe0ed7a479c64f27e8adda..089a8f08853d40b09720aaecb50aed94e3d01c93 100644 (file)
@@ -4411,7 +4411,6 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
        struct smb_filename *smb_fname_dst = NULL;
        const char *dst_original_lcomp = NULL;
        uint32_t ucf_flags = ucf_flags_from_smb_request(req);
-       NTTIME dst_twrp = 0;
        NTSTATUS status = NT_STATUS_OK;
        bool is_dfs = (req->flags2 & FLAGS2_DFS_PATHNAMES);
        TALLOC_CTX *ctx = talloc_tos();
@@ -4463,14 +4462,11 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
                        goto out;
                }
        } else {
-               if (ucf_flags & UCF_GMT_PATHNAME) {
-                       extract_snapshot_token(newname, &dst_twrp);
-               }
                status = filename_convert_dirfsp(ctx,
                                                 conn,
                                                 newname,
                                                 ucf_flags,
-                                                dst_twrp,
+                                                0, /* Never a TWRP. */
                                                 &dst_dirfsp,
                                                 &smb_fname_dst);
                if (!NT_STATUS_IS_OK(status)) {