From: Jeremy Allison <jra@samba.org>
Date: Tue, 29 Sep 2020 21:21:08 +0000 (-0700)
Subject: s3: smbd: Remove unused 'bool *ppath_contains_wcard' parameter from dfs_redirect()
X-Git-Tag: talloc-2.3.2~383
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7bb8075d2404c3dd798447b79842c0a8e2af898;p=thirdparty%2Fsamba.git

s3: smbd: Remove unused 'bool *ppath_contains_wcard' parameter from dfs_redirect()

resolve_dfspath_wcard() is now a tranparent wrapper for dfs_redirect().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 9c3b183ad20..9878be59633 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -821,14 +821,14 @@ static NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
 			const char *path_in,
 			uint32_t ucf_flags,
 			bool allow_broken_path,
-			char **pp_path_out,
-			bool *ppath_contains_wcard)
+			char **pp_path_out)
 {
 	const struct loadparm_substitution *lp_sub =
 		loadparm_s3_global_substitution();
 	NTSTATUS status;
 	bool search_wcard_flag = (ucf_flags & UCF_ALWAYS_ALLOW_WCARD_LCOMP);
 	struct dfs_path *pdp = talloc(ctx, struct dfs_path);
+	bool ignore = false;
 
 	if (!pdp) {
 		return NT_STATUS_NO_MEMORY;
@@ -836,7 +836,7 @@ static NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
 
 	status = parse_dfs_path(conn, path_in, search_wcard_flag,
 				allow_broken_path, pdp,
-			ppath_contains_wcard);
+			&ignore);
 	if (!NT_STATUS_IS_OK(status)) {
 		TALLOC_FREE(pdp);
 		return status;
@@ -1815,7 +1815,6 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
 				bool allow_broken_path,
 				char **pp_name_out)
 {
-	bool ignore = false;
 	NTSTATUS status = NT_STATUS_OK;
 
 	status = dfs_redirect(ctx,
@@ -1823,7 +1822,6 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
 				name_in,
 				ucf_flags,
 				allow_broken_path,
-				pp_name_out,
-				&ignore);
+				pp_name_out);
 	return status;
 }