s3: smbd: MS-DFS - We no longer ever set UCF_COND_ALLOW_WCARD_LCOMP so don't check...
authorJeremy Allison <jra@samba.org>
Tue, 29 Sep 2020 03:08:45 +0000 (20:08 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 30 Sep 2020 20:46:39 +0000 (20:46 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/msdfs.c

index 2c31e2b960ad47dd6571b5bf8f5712fd84e0a7e3..744f99735671135c048dbb17e750cd8ca5cc299d 100644 (file)
@@ -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) {