s3: smbd: Remove unused 'bool *ppath_contains_wcard' parameter from resolve_dfspath_w...

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 9b6f0a78790a260ecae32a61ca2f5915ac62a175..459f78cf6180619d1b4f3cf2a97ec069d49fcd98 100644 (file)
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1828,8 +1828,7 @@ char *get_original_lcomp(TALLOC_CTX *ctx,
                                filename_in,
                                ucf_flags,
                                !conn->sconn->using_smb2,
-                               &fname,
-                               NULL);
+                               &fname);
                if (!NT_STATUS_IS_OK(status)) {
                        DBG_DEBUG("resolve_dfspath "
                                "failed for name %s with %s\n",
@@ -1924,14 +1923,12 @@ static NTSTATUS filename_convert_internal(TALLOC_CTX *ctx,
        *_smb_fname = NULL;
 
        if (ucf_flags & UCF_DFS_PATHNAME) {
-               bool path_contains_wcard = false;
                char *fname = NULL;
                status = resolve_dfspath_wcard(ctx, conn,
                                name_in,
                                ucf_flags,
                                !conn->sconn->using_smb2,
-                               &fname,
-                               &path_contains_wcard);
+                               &fname);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(10,("filename_convert_internal: resolve_dfspath "
                                "failed for name %s with %s\n",

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 744f99735671135c048dbb17e750cd8ca5cc299d..9c3b183ad20cb6bf5a2c2f15799c1ca083a3a64d 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1805,9 +1805,7 @@ struct junction_map *enum_msdfs_links(TALLOC_CTX *ctx,
 }
 
 /******************************************************************************
- Core function to resolve a dfs pathname possibly containing a wildcard.  If
- ppath_contains_wcard != NULL, it will be set to true if a wildcard is
- detected during dfs resolution.
+ Core function to resolve a dfs pathname.
 ******************************************************************************/
 
 NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
@@ -1815,10 +1813,9 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
                                const char *name_in,
                                uint32_t ucf_flags,
                                bool allow_broken_path,
-                               char **pp_name_out,
-                               bool *ppath_contains_wcard)
+                               char **pp_name_out)
 {
-       bool path_contains_wcard = false;
+       bool ignore = false;
        NTSTATUS status = NT_STATUS_OK;
 
        status = dfs_redirect(ctx,
@@ -1827,12 +1824,6 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
                                ucf_flags,
                                allow_broken_path,
                                pp_name_out,
-                               &path_contains_wcard);
-
-       if (NT_STATUS_IS_OK(status) &&
-                               ppath_contains_wcard != NULL &&
-                               path_contains_wcard) {
-               *ppath_contains_wcard = path_contains_wcard;
-       }
+                               &ignore);
        return status;
 }

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index e122a92575dfb5a2acd9c10ed41cccf05b0a8e20..c25ba5340b7f041be7601105089776f669f50911 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -554,8 +554,7 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
                                const char *name_in,
                                uint32_t ucf_flags,
                                bool allow_broken_path,
-                               char **pp_name_out,
-                               bool *ppath_contains_wcard);
+                               char **pp_name_out);
 struct connection_struct;
 struct smb_filename;
 struct conn_struct_tos {