diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:33:26 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:34:59 +0100 |
| commit | 0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6 (patch) | |
| tree | 5ac6a5d6276f2645e0d4f2ae89c92420bd66985f /source3/client | |
| parent | 81c46686db36eaffd25c013f19094b01a8406c6a (diff) | |
| download | samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.gz samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.bz2 samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.zip | |
Revert "s3: Move the global variable Protocol to struct smbd_server_connection"
This reverts commit c85a4c9ba4a7de65a7850f6f9708df66bd24deea.
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 2 | ||||
| -rw-r--r-- | source3/client/clitar.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 19efa03d3a..7cbaa81d52 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(), - PROTOCOL_NONE, false)) { + get_Protocol(), 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 7a956f9e56..4cbe69f649 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, - PROTOCOL_NONE, True))) { + get_Protocol(), 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, PROTOCOL_NONE, + clipn, get_Protocol(), True))); DEBUG(5, ("Skip = %i, cliplist=%s, file=%s\n", skip, (cliplist?cliplist[0]:NULL), finfo.name)); |