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

s3: smbd: Remove the 'bool *ppath_contains_wcard' parameter from filename_convert_internal()

It's always ignored.

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

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index bf0305a9e53..9b6f0a78790 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1916,7 +1916,6 @@ static NTSTATUS filename_convert_internal(TALLOC_CTX *ctx,
 				const char *name_in,
 				uint32_t ucf_flags,
 				NTTIME twrp,
-				bool *ppath_contains_wcard,
 				struct smb_filename **_smb_fname)
 {
 	struct smb_filename *smb_fname = NULL;
@@ -1941,9 +1940,6 @@ static NTSTATUS filename_convert_internal(TALLOC_CTX *ctx,
 			return status;
 		}
 		name_in = fname;
-		if (ppath_contains_wcard != NULL && path_contains_wcard) {
-			*ppath_contains_wcard = path_contains_wcard;
-		}
 		ucf_flags &= ~UCF_DFS_PATHNAME;
 	}
 
@@ -2011,14 +2007,12 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
 				NTTIME twrp,
 				struct smb_filename **pp_smb_fname)
 {
-	bool ignore = false;
 	return filename_convert_internal(ctx,
 					conn,
 					NULL,
 					name_in,
 					ucf_flags,
 					twrp,
-					&ignore,
 					pp_smb_fname);
 }
 
@@ -2034,13 +2028,11 @@ NTSTATUS filename_convert_with_privilege(TALLOC_CTX *ctx,
                                 uint32_t ucf_flags,
                                 struct smb_filename **pp_smb_fname)
 {
-	bool ignore = false;
 	return filename_convert_internal(ctx,
 					conn,
 					smbreq,
 					name_in,
 					ucf_flags,
 					0,
-					&ignore,
 					pp_smb_fname);
 }