From d20b60c3200b5e1881cdf4b59da154d1af7e3994 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 10 Aug 2022 11:32:30 -0700 Subject: [PATCH] s3: smbd: Remove call to dfs_redirect() from filename_convert_dirfsp_nosymlink(). Use dfs_filename_convert() instead. There are now no more callers of dfs_redirect(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=15144 Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/smbd/filename.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index cba012acc3e..b64fb908f16 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -2384,28 +2384,26 @@ static NTSTATUS filename_convert_dirfsp_nosymlink( NTSTATUS status = NT_STATUS_UNSUCCESSFUL; if (ucf_flags & UCF_DFS_PATHNAME) { - char *fname = NULL; - NTTIME dfs_twrp = 0; - status = dfs_redirect( - mem_ctx, - conn, - name_in, - ucf_flags, - !conn->sconn->using_smb2, - &dfs_twrp, - &fname); + /* + * We've been given a raw DFS pathname. + */ + char *pathname = NULL; + DBG_DEBUG("Before dfs_filename_convert name_in: %s\n", name_in); + status = dfs_filename_convert(mem_ctx, + conn, + ucf_flags, + name_in, + &pathname); if (!NT_STATUS_IS_OK(status)) { - DBG_DEBUG("dfs_redirect " + DBG_DEBUG("dfs_filename_convert " "failed for name %s with %s\n", name_in, nt_errstr(status)); return status; } - name_in = fname; ucf_flags &= ~UCF_DFS_PATHNAME; - if (twrp == 0 && dfs_twrp != 0) { - twrp = dfs_twrp; - } + name_in = pathname; + DBG_DEBUG("After dfs_filename_convert name_in: %s\n", name_in); } if (is_fake_file_path(name_in)) { -- 2.47.3