From: Jeremy Allison <jra@samba.org>
Date: Fri, 25 Mar 2016 18:26:39 +0000 (-0700)
Subject: s3: smbd: DFS: Pass uint32_t ucf_flags through into dfs_redirect().
X-Git-Tag: tdb-1.3.9~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6156c825bbb803cb70a03b0fe22d2576d82bab30;p=thirdparty%2Fsamba.git

s3: smbd: DFS: Pass uint32_t ucf_flags through into dfs_redirect().

Eventually move this down to the call to unix_convert()
inside the DFS code.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
---

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 4f64eff202d..a51548a531d 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -817,12 +817,14 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
 static NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
 			connection_struct *conn,
 			const char *path_in,
-			bool search_wcard_flag,
+			uint32_t ucf_flags,
 			bool allow_broken_path,
 			char **pp_path_out,
 			bool *ppath_contains_wcard)
 {
 	NTSTATUS status;
+	bool search_wcard_flag = (ucf_flags &
+		(UCF_COND_ALLOW_WCARD_LCOMP|UCF_ALWAYS_ALLOW_WCARD_LCOMP));
 	struct dfs_path *pdp = talloc(ctx, struct dfs_path);
 
 	if (!pdp) {
@@ -1673,14 +1675,12 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
 {
 	bool path_contains_wcard;
 	NTSTATUS status = NT_STATUS_OK;
-	bool allow_wcards = (ucf_flags &
-		(UCF_COND_ALLOW_WCARD_LCOMP|UCF_ALWAYS_ALLOW_WCARD_LCOMP));
 
 	if (dfs_pathnames) {
 		status = dfs_redirect(ctx,
 					conn,
 					name_in,
-					allow_wcards,
+					ucf_flags,
 					allow_broken_path,
 					pp_name_out,
 					&path_contains_wcard);