From: Volker Lendecke <vl@samba.org>
Date: Sat, 21 Nov 2009 18:04:34 +0000 (+0100)
Subject: s3: Make the implicit reference to Protocol in mask_match_list() explicit
X-Git-Url: http://git.samba.org/samba.git/?p=gd%2Fsamba%2F.git;a=commitdiff_plain;h=1e22899d268ae5a089f941a204413c07ee64fc78

s3: Make the implicit reference to Protocol in mask_match_list() explicit
---

diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index d9733294274..4cbe69f6492 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -827,7 +827,9 @@ static void do_tar(file_info *finfo, const char *dir)
 		DEBUG(5, ("...tar_re_search: %d\n", tar_re_search));
 
 		if ((!tar_re_search && clipfind(cliplist, clipn, exclaim)) ||
-				(tar_re_search && mask_match_list(exclaim, cliplist, clipn, True))) {
+		    (tar_re_search
+		     && mask_match_list(exclaim, cliplist, clipn,
+					get_Protocol(), True))) {
 			DEBUG(3,("Skipping file %s\n", exclaim));
 			TALLOC_FREE(exclaim);
 			return;
@@ -1210,7 +1212,10 @@ static void do_tarput(void)
 		/* Well, now we have a header, process the file ...            */
 		/* Should we skip the file? We have the long name as well here */
 		skip = clipn && ((!tar_re_search && clipfind(cliplist, clipn, finfo.name) ^ tar_excl) ||
-					(tar_re_search && mask_match_list(finfo.name, cliplist, clipn, True)));
+				 (tar_re_search
+				  && mask_match_list(finfo.name, cliplist,
+						     clipn, get_Protocol(),
+						     True)));
 
 		DEBUG(5, ("Skip = %i, cliplist=%s, file=%s\n", skip, (cliplist?cliplist[0]:NULL), finfo.name));
 		if (skip) {
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 33999650438..fa0a69ea587 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1191,7 +1191,8 @@ 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_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 mask_match_list(const char *string, char **list, int listLen,
+		     enum protocol_types proto, bool is_case_sensitive);
 bool unix_wild_match(const char *pattern, const char *string);
 bool name_to_fqdn(fstring fqdn, const char *name);
 void *talloc_append_blob(TALLOC_CTX *mem_ctx, void *buf, DATA_BLOB blob);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index e3ceea49517..1ee1bdc35fd 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2418,11 +2418,11 @@ bool mask_match_search(const char *string, const char *pattern, bool is_case_sen
  on each.  Returns True if any of the patterns match.
 *******************************************************************/
 
-bool mask_match_list(const char *string, char **list, int listLen, bool is_case_sensitive)
+bool mask_match_list(const char *string, char **list, int listLen,
+		     enum protocol_types proto, bool is_case_sensitive)
 {
        while (listLen-- > 0) {
-               if (mask_match(string, *list++, get_Protocol(),
-			      is_case_sensitive))
+               if (mask_match(string, *list++, proto, is_case_sensitive))
                        return True;
        }
        return False;