sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

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

Browse Source
This commit is contained in:
Volker Lendecke 2009-11-21 19:04:34 +01:00
parent e23d8a3d1f
commit 1e22899d26
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/client/clitar.c
View File

@ -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) {

3
source3/include/proto.h
View File

@ -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);

6
source3/lib/util.c
View File

@ -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;