From: Jeremy Allison Date: Tue, 5 May 2020 17:28:08 +0000 (-0700) Subject: Revert "smbd: fullpath based on fsp->fsp_name may contain an @GMT token" X-Git-Tag: ldb-2.2.0~647 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d22b9edff76afff3d4d6ce8722b2199b6c3b866;p=thirdparty%2Fsamba.git Revert "smbd: fullpath based on fsp->fsp_name may contain an @GMT token" 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 Reviewed-by: Ralph Boehme Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue May 5 20:55:42 UTC 2020 on sn-devel-184 --- diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c index 562c8f537ee..4da051e18eb 100644 --- a/source3/smbd/smb2_query_directory.c +++ b/source3/smbd/smb2_query_directory.c @@ -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,