summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-23 16:34:00 +0100
committerVolker Lendecke <vl@samba.org>2009-11-23 16:35:00 +0100
commitd6e55d8ec0335cd2494ca54f1471fad4e2b69795 (patch)
treee7a6bcd716e8b5a16c4e496b5f4fd5fff1fd596d /source3/client
parent5c4885a26bbdc1a5086417b63395debd2670db85 (diff)
downloadsamba-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.
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/clitar.c9
1 files changed, 2 insertions, 7 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) {