summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-23 16:33:53 +0100
committerVolker Lendecke <vl@samba.org>2009-11-23 16:35:00 +0100
commit5c4885a26bbdc1a5086417b63395debd2670db85 (patch)
treeec042f16d03049bdbe7bb0f886cba6742d32b8d1 /source3/lib
parent7930206f5c80b15aded213c3f438ff0120fdea2c (diff)
downloadsamba-5c4885a26bbdc1a5086417b63395debd2670db85.tar.gz
samba-5c4885a26bbdc1a5086417b63395debd2670db85.tar.bz2
samba-5c4885a26bbdc1a5086417b63395debd2670db85.zip
Revert "s3: Make the implicit reference to Protocol in is_in_path() explicit"
This reverts commit f7b4151a64d8c6851e62255a7139fd00a5fc63a3.
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/util.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 933b787697..1ee1bdc35f 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1666,8 +1666,7 @@ const char *readdirname(SMB_STRUCT_DIR *p)
of a path matches a (possibly wildcarded) entry in a namelist.
********************************************************************/
-bool is_in_path(const char *name, name_compare_entry *namelist,
- enum protocol_types proto, bool case_sensitive)
+bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive)
{
const char *last_component;
@@ -1689,7 +1688,7 @@ bool is_in_path(const char *name, name_compare_entry *namelist,
for(; namelist->name != NULL; namelist++) {
if(namelist->is_wild) {
if (mask_match(last_component, namelist->name,
- proto, case_sensitive)) {
+ get_Protocol(), case_sensitive)) {
DEBUG(8,("is_in_path: mask match succeeded\n"));
return True;
}