]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Remove the 'bool *ppath_contains_wcard' parameter from filename_convert_int...
authorJeremy Allison <jra@samba.org>
Tue, 29 Sep 2020 21:12:41 +0000 (14:12 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 30 Sep 2020 20:46:42 +0000 (20:46 +0000)
It's always ignored.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/filename.c

index bf0305a9e53e39cbb0f7117128c6dc8654613c6c..9b6f0a78790a260ecae32a61ca2f5915ac62a175 100644 (file)
@@ -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);
 }