s3: smbd: The only caller of filename_convert_with_privilege() passes in NULL for...

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 d0be60a42f31fee4371c289236f1b7ddfd17151e..bf0305a9e53e39cbb0f7117128c6dc8654613c6c 100644 (file)
--- 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 394122420fd0dfcefe9d0103f74115e6ab467dc7..e122a92575dfb5a2acd9c10ed41cccf05b0a8e20 100644 (file)
--- 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 174d646dbf1cafa1bc65d3adc016a26ee20ea026..40c2559861f7fd86f754aa0144dc79c36e1ea1d9 100644 (file)
--- 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,