Revert "s3: Make the implicit reference to Protocol in mask_match() explicit"

This reverts commit e23d8a3d1f558a7e98ef2afd71e1d15c5b3a71bc.

diff --git a/source3/client/client.c b/source3/client/client.c
index 7cbaa81d5290811f191422e0b2aeb693f49c0ad0..6773e6d90a795213a19eba57ddc5718a5eaed40f 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -472,8 +472,7 @@ static bool do_this_one(file_info *finfo)
        }
 
        if (*client_get_fileselection() &&
        }
 
        if (*client_get_fileselection() &&

-           !mask_match(finfo->name, client_get_fileselection(),
-                       get_Protocol(), false)) {
+           !mask_match(finfo->name,client_get_fileselection(),false)) {

                DEBUG(3,("mask_match %s failed\n", finfo->name));
                return false;
        }
                DEBUG(3,("mask_match %s failed\n", finfo->name));
                return false;
        }

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 55466f3844ef4e4d62e03f3e2a3e3f752cf78691..88f6dd54ae19fc54da6bf885f9f007077b8b53a8 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1186,8 +1186,7 @@ bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent,
                    const char **name);
 bool ms_has_wild(const char *s);
 bool ms_has_wild_w(const smb_ucs2_t *s);
                    const char **name);
 bool ms_has_wild(const char *s);
 bool ms_has_wild_w(const smb_ucs2_t *s);

-bool mask_match(const char *string, const char *pattern,
-               enum protocol_types proto, bool is_case_sensitive);
+bool mask_match(const char *string, const char *pattern, bool is_case_sensitive);

 bool mask_match_search(const char *string, const char *pattern, bool is_case_sensitive);
 bool mask_match_list(const char *string, char **list, int listLen, bool is_case_sensitive);
 bool unix_wild_match(const char *pattern, const char *string);
 bool mask_match_search(const char *string, const char *pattern, bool is_case_sensitive);
 bool mask_match_list(const char *string, char **list, int listLen, bool is_case_sensitive);
 bool unix_wild_match(const char *pattern, const char *string);

diff --git a/source3/lib/util.c b/source3/lib/util.c
index e3ceea495172a89eeb416e6a73bdaeb0e940743c..e0b09c4f1fa91396ab8e4fa2e505cba007482598 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1687,8 +1687,7 @@ bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensit
 
        for(; namelist->name != NULL; namelist++) {
                if(namelist->is_wild) {
 
        for(; namelist->name != NULL; namelist++) {
                if(namelist->is_wild) {

-                       if (mask_match(last_component, namelist->name,
-                                      get_Protocol(), case_sensitive)) {
+                       if (mask_match(last_component, namelist->name, case_sensitive)) {

                                DEBUG(8,("is_in_path: mask match succeeded\n"));
                                return True;
                        }
                                DEBUG(8,("is_in_path: mask match succeeded\n"));
                                return True;
                        }


@@ -2385,16 +2384,14 @@ bool ms_has_wild_w(const smb_ucs2_t *s)
  of the ".." name.
 *******************************************************************/
 
  of the ".." name.
 *******************************************************************/
 

-bool mask_match(const char *string, const char *pattern,
-               enum protocol_types proto, bool is_case_sensitive)
+bool mask_match(const char *string, const char *pattern, bool is_case_sensitive)

 {
        if (ISDOTDOT(string))
                string = ".";
        if (ISDOT(pattern))
                return False;
 
 {
        if (ISDOTDOT(string))
                string = ".";
        if (ISDOT(pattern))
                return False;
 

-       return ms_fnmatch(pattern, string, proto <= PROTOCOL_LANMAN2,
-                         is_case_sensitive) == 0;
+       return ms_fnmatch(pattern, string, Protocol <= PROTOCOL_LANMAN2, is_case_sensitive) == 0;

 }
 
 /*******************************************************************
 }
 
 /*******************************************************************


@@ -2421,8 +2418,7 @@ bool mask_match_search(const char *string, const char *pattern, bool is_case_sen
 bool mask_match_list(const char *string, char **list, int listLen, bool is_case_sensitive)
 {
        while (listLen-- > 0) {
 bool mask_match_list(const char *string, char **list, int listLen, bool is_case_sensitive)
 {
        while (listLen-- > 0) {

-               if (mask_match(string, *list++, get_Protocol(),
-                             is_case_sensitive))
+               if (mask_match(string, *list++, is_case_sensitive))

                        return True;
        }
        return False;
                        return True;
        }
        return False;

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a113a9d98261487873ab536da695238cec431073..682f56ff33e834c0dc94d2b42b140d387f10af27 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2638,7 +2638,7 @@ NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req,
                                continue;
                        }
 
                                continue;
                        }
 

-                       if(!mask_match(dname, fname_mask, get_Protocol(),
+                       if(!mask_match(dname, fname_mask,

                                       conn->case_sensitive)) {
                                TALLOC_FREE(frame);
                                TALLOC_FREE(talloced);
                                       conn->case_sensitive)) {
                                TALLOC_FREE(frame);
                                TALLOC_FREE(talloced);


@@ -6337,8 +6337,7 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
                        continue;
                }
 
                        continue;
                }
 

-               if(!mask_match(dname, fname_src_mask, get_Protocol(),
-                              conn->case_sensitive)) {
+               if(!mask_match(dname, fname_src_mask, conn->case_sensitive)) {

                        TALLOC_FREE(talloced);
                        continue;
                }
                        TALLOC_FREE(talloced);
                        continue;
                }


@@ -6969,7 +6968,7 @@ void reply_copy(struct smb_request *req)
                                continue;
                        }
 
                                continue;
                        }
 

-                       if(!mask_match(dname, fname_src_mask, get_Protocol(),
+                       if(!mask_match(dname, fname_src_mask,

                                       conn->case_sensitive)) {
                                TALLOC_FREE(talloced);
                                continue;
                                       conn->case_sensitive)) {
                                TALLOC_FREE(talloced);
                                continue;

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 8226b6c4280c9fd3b2ef0eb6590dbcef2aef6b6c..17ebd81313c137d907ae7b7ceaaa8e0f47019e55 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1368,7 +1368,7 @@ static bool smbd_dirptr_lanman2_match_fn(TALLOC_CTX *ctx,
                                fname, mask);
        state->got_exact_match = got_match;
        if (!got_match) {
                                fname, mask);
        state->got_exact_match = got_match;
        if (!got_match) {

-               got_match = mask_match(fname, mask, get_Protocol(),
+               got_match = mask_match(fname, mask,

                                       state->conn->case_sensitive);
        }
 
                                       state->conn->case_sensitive);
        }
 


@@ -1393,7 +1393,6 @@ static bool smbd_dirptr_lanman2_match_fn(TALLOC_CTX *ctx,
                state->got_exact_match = got_match;
                if (!got_match) {
                        got_match = mask_match(mangled_name, mask,
                state->got_exact_match = got_match;
                if (!got_match) {
                        got_match = mask_match(mangled_name, mask,

-                                              get_Protocol(),

                                               state->conn->case_sensitive);
                }
        }
                                               state->conn->case_sensitive);
                }
        }