From: Volker Lendecke <vl@samba.org>
Date: Mon, 24 Oct 2022 17:56:31 +0000 (+0200)
Subject: smbd: No dfs_filename_convert() in filename_convert_smb1_search_path()
X-Git-Tag: talloc-2.4.0~396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=453f846e1897f7cbcc454f3095eb21d7ffb32be8;p=thirdparty%2Fsamba.git

smbd: No dfs_filename_convert() in filename_convert_smb1_search_path()

We further down call filename_convert_dirfsp(), which also has this
call. No need to copy that code here as well.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 1f8b33c7fda..c66e8b4b24e 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -509,29 +509,6 @@ NTSTATUS filename_convert_smb1_search_path(TALLOC_CTX *ctx,
 		ucf_flags &= ~UCF_GMT_PATHNAME;
 	}
 
-	if (ucf_flags & UCF_DFS_PATHNAME) {
-		/*
-		 * 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(ctx,
-					      conn,
-					      ucf_flags,
-					      name_in,
-					      &pathname);
-                if (!NT_STATUS_IS_OK(status)) {
-			DBG_DEBUG("dfs_filename_convert "
-				"failed for name %s with %s\n",
-				name_in,
-				nt_errstr(status));
-			return status;
-		}
-		ucf_flags &= ~UCF_DFS_PATHNAME;
-		name_in = pathname;
-		DBG_DEBUG("After dfs_filename_convert name_in: %s\n", name_in);
-	}
-
 	/* Get the original lcomp. */
 	mask = get_original_lcomp(ctx,
 				  conn,