From: Jeremy Allison <jra@samba.org>
Date: Tue, 29 Sep 2020 21:09:55 +0000 (-0700)
Subject: s3: smbd: The only caller of filename_convert_with_privilege() passes in NULL for... 
X-Git-Tag: talloc-2.3.2~386
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb60ed6b5ed12f144642b58203d5d37ab81fe20b;p=thirdparty%2Fsamba.git

s3: smbd: The only caller of filename_convert_with_privilege() passes in NULL for the 'bool *ppath_contains_wcard' parameter.

Remove it.

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 d0be60a42f3..bf0305a9e53 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -2032,15 +2032,15 @@ NTSTATUS filename_convert_with_privilege(TALLOC_CTX *ctx,
 				struct smb_request *smbreq,
                                 const char *name_in,
                                 uint32_t ucf_flags,
-                                bool *ppath_contains_wcard,
                                 struct smb_filename **pp_smb_fname)
 {
+	bool ignore = false;
 	return filename_convert_internal(ctx,
 					conn,
 					smbreq,
 					name_in,
 					ucf_flags,
 					0,
-					ppath_contains_wcard,
+					&ignore,
 					pp_smb_fname);
 }
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 394122420fd..e122a92575d 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -396,7 +396,6 @@ NTSTATUS filename_convert_with_privilege(TALLOC_CTX *mem_ctx,
 			struct smb_request *smbreq,
 			const char *name_in,
 			uint32_t ucf_flags,
-			bool *ppath_contains_wcard,
 			struct smb_filename **pp_smb_fname);
 
 /* The following definitions come from smbd/files.c  */
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 174d646dbf1..40c2559861f 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2831,7 +2831,6 @@ close_if_end = %d requires_resume_key = %d backup_priv = %d level = 0x%x, max_da
 				req,
 				directory,
 				ucf_flags,
-				NULL,
 				&smb_dname);
 	} else {
 		ntstatus = filename_convert(talloc_tos(), conn,