Revert "smbd: fullpath based on fsp->fsp_name may contain an @GMT token"
authorJeremy Allison <jra@samba.org>
Tue, 5 May 2020 17:28:08 +0000 (10:28 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 5 May 2020 20:55:41 +0000 (20:55 +0000)
This reverts commit e593c38f5a8602be497a29e145ccdd4f9cc595e7.

As stated in the original commit message, "When canonicalize_snapshot_path()
starts actually stripping off @GMT tokens, we can remove this again."

canonicalize_snapshot_path() now strips off @GMT tokens from
any SMB1 names, so this is now not needed anymore.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue May  5 20:55:42 UTC 2020 on sn-devel-184

source3/smbd/smb2_query_directory.c

index 562c8f537ee34b81b1b70c08df6e313c83899d24..4da051e18ebe281a918ea28e72c66518c10111dd 100644 (file)
@@ -421,11 +421,6 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
                        }
                        fullpath = tmp;
                }
-
-               if (fsp->fsp_name->twrp != 0) {
-                       ucf_flags |= UCF_GMT_PATHNAME;
-               }
-
                status = filename_convert(state,
                                conn,
                                fullpath,