summaryrefslogtreecommitdiff
path: root/source3/lib/util.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-08-20 05:15:26 +0000
committerAndrew Tridgell <tridge@samba.org>2001-08-20 05:15:26 +0000
commit11ce0f4d2d493702386c0bd49c8e2dd2aad84d56 (patch)
treef9d0e8cc2b71506b658e2a8519bf8bf4201f7618 /source3/lib/util.c
parent5f0b9d08303aeddb01019ff2a63001c9dfa3088b (diff)
downloadsamba-11ce0f4d2d493702386c0bd49c8e2dd2aad84d56.tar.gz
samba-11ce0f4d2d493702386c0bd49c8e2dd2aad84d56.tar.bz2
samba-11ce0f4d2d493702386c0bd49c8e2dd2aad84d56.zip
a bunch of fixes from the sflight to seattle
in particular: - fixed NT status code for a bunch of ops - fixed handling of protocol levels in ms_fnmatch (This used to be commit 3eba9606f71f90bfd9820af26f8676277ed22390)
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r--source3/lib/util.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 33d604e85f..3161aba63f 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1782,19 +1782,21 @@ BOOL ms_has_wild(char *s)
*******************************************************************/
BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive)
{
+ extern int Protocol;
fstring p2, s2;
+
if (strcmp(string,"..") == 0) string = ".";
if (strcmp(pattern,".") == 0) return False;
if (is_case_sensitive) {
- return ms_fnmatch(pattern, string) == 0;
+ return ms_fnmatch(pattern, string, Protocol) == 0;
}
fstrcpy(p2, pattern);
fstrcpy(s2, string);
strlower(p2);
strlower(s2);
- return ms_fnmatch(p2, s2) == 0;
+ return ms_fnmatch(p2, s2, Protocol) == 0;
}
/*******************************************************************
@@ -1804,12 +1806,13 @@ BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive)
BOOL wild_match(char *string, char *pattern)
{
pstring p2, s2;
+ extern int Protocol;
pstrcpy(p2, pattern);
pstrcpy(s2, string);
strlower(p2);
strlower(s2);
- return ms_fnmatch(p2, s2) == 0;
+ return ms_fnmatch(p2, s2, Protocol) == 0;
}
#ifdef __INSURE__