From: Jeremy Allison <jra@samba.org>
Date: Tue, 29 Sep 2020 03:08:45 +0000 (-0700)
Subject: s3: smbd: MS-DFS - We no longer ever set UCF_COND_ALLOW_WCARD_LCOMP so don't check... 
X-Git-Tag: talloc-2.3.2~417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d11a87ea13101962420e38a5cf96bf03f8ca0b6;p=thirdparty%2Fsamba.git

s3: smbd: MS-DFS - We no longer ever set UCF_COND_ALLOW_WCARD_LCOMP so don't check for it.

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 2c31e2b960a..744f9973567 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -703,9 +703,7 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
 
 	if (NT_STATUS_IS_OK(status)) {
 		/* XX_ALLOW_WCARD_XXX is called from search functions. */
-		if (ucf_flags &
-				(UCF_COND_ALLOW_WCARD_LCOMP|
-				 UCF_ALWAYS_ALLOW_WCARD_LCOMP)) {
+		if (ucf_flags & UCF_ALWAYS_ALLOW_WCARD_LCOMP) {
 			DEBUG(6,("dfs_path_lookup (FindFirst) No redirection "
 				 "for dfs link %s.\n", dfspath));
 			status = NT_STATUS_OK;
@@ -829,8 +827,7 @@ static NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
 	const struct loadparm_substitution *lp_sub =
 		loadparm_s3_global_substitution();
 	NTSTATUS status;
-	bool search_wcard_flag = (ucf_flags &
-		(UCF_COND_ALLOW_WCARD_LCOMP|UCF_ALWAYS_ALLOW_WCARD_LCOMP));
+	bool search_wcard_flag = (ucf_flags & UCF_ALWAYS_ALLOW_WCARD_LCOMP);
 	struct dfs_path *pdp = talloc(ctx, struct dfs_path);
 
 	if (!pdp) {