summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-21 19:04:34 +0100
committerVolker Lendecke <vl@samba.org>2009-11-21 20:49:17 +0100
commit1e22899d268ae5a089f941a204413c07ee64fc78 (patch)
tree852ba86533a077871c3f9cfa63f811c6a43fad7b /source3/client
parente23d8a3d1f558a7e98ef2afd71e1d15c5b3a71bc (diff)
downloadsamba-1e22899d268ae5a089f941a204413c07ee64fc78.tar.gz
samba-1e22899d268ae5a089f941a204413c07ee64fc78.tar.bz2
samba-1e22899d268ae5a089f941a204413c07ee64fc78.zip
s3: Make the implicit reference to Protocol in mask_match_list() explicit
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/clitar.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index d973329427..4cbe69f649 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) {