summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-21 19:57:41 +0100
committerVolker Lendecke <vl@samba.org>2009-11-21 20:49:17 +0100
commitc85a4c9ba4a7de65a7850f6f9708df66bd24deea (patch)
tree5205ef1da477ed65127276d684cf48a7edfbe7d5 /source3/client
parent6a149022976fe6a5579ec9afc7a4d2dcb44dc8af (diff)
downloadsamba-c85a4c9ba4a7de65a7850f6f9708df66bd24deea.tar.gz
samba-c85a4c9ba4a7de65a7850f6f9708df66bd24deea.tar.bz2
samba-c85a4c9ba4a7de65a7850f6f9708df66bd24deea.zip
s3: Move the global variable Protocol to struct smbd_server_connection
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/client.c2
-rw-r--r--source3/client/clitar.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 7cbaa81d52..19efa03d3a 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -473,7 +473,7 @@ static bool do_this_one(file_info *finfo)
if (*client_get_fileselection() &&
!mask_match(finfo->name, client_get_fileselection(),
- get_Protocol(), false)) {
+ PROTOCOL_NONE, false)) {
DEBUG(3,("mask_match %s failed\n", finfo->name));
return false;
}
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 4cbe69f649..7a956f9e56 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -829,7 +829,7 @@ static void do_tar(file_info *finfo, const char *dir)
if ((!tar_re_search && clipfind(cliplist, clipn, exclaim)) ||
(tar_re_search
&& mask_match_list(exclaim, cliplist, clipn,
- get_Protocol(), True))) {
+ PROTOCOL_NONE, True))) {
DEBUG(3,("Skipping file %s\n", exclaim));
TALLOC_FREE(exclaim);
return;
@@ -1214,7 +1214,7 @@ static void do_tarput(void)
skip = clipn && ((!tar_re_search && clipfind(cliplist, clipn, finfo.name) ^ tar_excl) ||
(tar_re_search
&& mask_match_list(finfo.name, cliplist,
- clipn, get_Protocol(),
+ clipn, PROTOCOL_NONE,
True)));
DEBUG(5, ("Skip = %i, cliplist=%s, file=%s\n", skip, (cliplist?cliplist[0]:NULL), finfo.name));