diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:34:00 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:35:00 +0100 |
| commit | d6e55d8ec0335cd2494ca54f1471fad4e2b69795 (patch) | |
| tree | e7a6bcd716e8b5a16c4e496b5f4fd5fff1fd596d | |
| parent | 5c4885a26bbdc1a5086417b63395debd2670db85 (diff) | |
| download | samba-d6e55d8ec0335cd2494ca54f1471fad4e2b69795.tar.gz samba-d6e55d8ec0335cd2494ca54f1471fad4e2b69795.tar.bz2 samba-d6e55d8ec0335cd2494ca54f1471fad4e2b69795.zip | |
Revert "s3: Make the implicit reference to Protocol in mask_match_list() explicit"
This reverts commit 1e22899d268ae5a089f941a204413c07ee64fc78.
| -rw-r--r-- | source3/client/clitar.c | 9 | ||||
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/lib/util.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 4cbe69f649..d973329427 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -827,9 +827,7 @@ 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, - get_Protocol(), True))) { + (tar_re_search && mask_match_list(exclaim, cliplist, clipn, True))) { DEBUG(3,("Skipping file %s\n", exclaim)); TALLOC_FREE(exclaim); return; @@ -1212,10 +1210,7 @@ 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, get_Protocol(), - True))); + (tar_re_search && mask_match_list(finfo.name, cliplist, clipn, 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 9b92b0d06b..55466f3844 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1189,8 +1189,7 @@ 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, - enum protocol_types proto, 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 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 1ee1bdc35f..e3ceea4951 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, - enum protocol_types proto, bool is_case_sensitive) +bool mask_match_list(const char *string, char **list, int listLen, bool is_case_sensitive) { while (listLen-- > 0) { - if (mask_match(string, *list++, proto, is_case_sensitive)) + if (mask_match(string, *list++, get_Protocol(), + is_case_sensitive)) return True; } return False; |