summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-05 03:26:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:54 -0500
commitd9b8eaabc5e1d549aa56ed45f2e410ad766075be (patch)
tree0dd7f155e1939e649b65b933abbe21eba464311b /source3
parent56fd69174ec939618a66bf663f3b4ea3448f2f8d (diff)
downloadsamba-d9b8eaabc5e1d549aa56ed45f2e410ad766075be.tar.gz
samba-d9b8eaabc5e1d549aa56ed45f2e410ad766075be.tar.bz2
samba-d9b8eaabc5e1d549aa56ed45f2e410ad766075be.zip
r2824: restored the is_case_sensitive option to ms_fnmatch() in Samba3. It is
very rarely used, but we sohuldn't be removing a feature in a minor release of this kind. (This used to be commit 4ce0505bc369243aa77013519ce4e4f6e50f5a48)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/ms_fnmatch.c31
-rw-r--r--source3/lib/util.c2
-rw-r--r--source3/torture/masktest.c2
3 files changed, 23 insertions, 12 deletions
diff --git a/source3/lib/ms_fnmatch.c b/source3/lib/ms_fnmatch.c
index bdfb26d0ca..3040dc7f9d 100644
--- a/source3/lib/ms_fnmatch.c
+++ b/source3/lib/ms_fnmatch.c
@@ -55,7 +55,8 @@ struct max_n {
not contain a '.', otherwise it points at the last dot in 'n'.
*/
static int ms_fnmatch_core(const smb_ucs2_t *p, const smb_ucs2_t *n,
- struct max_n *max_n, const smb_ucs2_t *ldot)
+ struct max_n *max_n, const smb_ucs2_t *ldot,
+ BOOL is_case_sensitive)
{
smb_ucs2_t c;
int i;
@@ -68,7 +69,7 @@ static int ms_fnmatch_core(const smb_ucs2_t *p, const smb_ucs2_t *n,
return null_match(p);
}
for (i=0; n[i]; i++) {
- if (ms_fnmatch_core(p, n+i, max_n+1, ldot) == 0) {
+ if (ms_fnmatch_core(p, n+i, max_n+1, ldot, is_case_sensitive) == 0) {
return 0;
}
}
@@ -86,9 +87,9 @@ static int ms_fnmatch_core(const smb_ucs2_t *p, const smb_ucs2_t *n,
return -1;
}
for (i=0; n[i]; i++) {
- if (ms_fnmatch_core(p, n+i, max_n+1, ldot) == 0) return 0;
+ if (ms_fnmatch_core(p, n+i, max_n+1, ldot, is_case_sensitive) == 0) return 0;
if (n+i == ldot) {
- if (ms_fnmatch_core(p, n+i+1, max_n+1, ldot) == 0) return 0;
+ if (ms_fnmatch_core(p, n+i+1, max_n+1, ldot, is_case_sensitive) == 0) return 0;
if (!max_n->postdot || max_n->postdot > n) max_n->postdot = n;
return -1;
}
@@ -125,8 +126,13 @@ static int ms_fnmatch_core(const smb_ucs2_t *p, const smb_ucs2_t *n,
break;
default:
- if (c != *n && toupper_w(c) != toupper_w(*n)) {
- return -1;
+ if (c != *n) {
+ if (is_case_sensitive) {
+ return -1;
+ }
+ if (toupper_w(c) != toupper_w(*n)) {
+ return -1;
+ }
}
n++;
break;
@@ -140,7 +146,8 @@ static int ms_fnmatch_core(const smb_ucs2_t *p, const smb_ucs2_t *n,
return -1;
}
-int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol)
+int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol,
+ BOOL is_case_sensitive)
{
wpstring p, s;
int ret, count, i;
@@ -153,7 +160,11 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
if (strpbrk(pattern, "<>*?\"") == NULL) {
/* this is not just an optmisation - it is essential
for LANMAN1 correctness */
- return StrCaseCmp(pattern, string);
+ if (is_case_sensitive) {
+ return strcmp(pattern, string);
+ } else {
+ return StrCaseCmp(pattern, string);
+ }
}
pstrcpy_wa(p, pattern);
@@ -190,7 +201,7 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
}
}
- ret = ms_fnmatch_core(p, s, max_n, strrchr_w(s, UCS2_CHAR('.')));
+ ret = ms_fnmatch_core(p, s, max_n, strrchr_w(s, UCS2_CHAR('.')), is_case_sensitive);
if (max_n) {
free(max_n);
@@ -203,5 +214,5 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
/* a generic fnmatch function - uses for non-CIFS pattern matching */
int gen_fnmatch(const char *pattern, const char *string)
{
- return ms_fnmatch(pattern, string, PROTOCOL_NT1);
+ return ms_fnmatch(pattern, string, PROTOCOL_NT1, False);
}
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 53ce8ab17b..5e88bd896f 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2325,7 +2325,7 @@ BOOL mask_match(const char *string, char *pattern, BOOL is_case_sensitive)
if (strcmp(pattern,".") == 0)
return False;
- return ms_fnmatch(pattern, string, Protocol) == 0;
+ return ms_fnmatch(pattern, string, Protocol, is_case_sensitive) == 0;
}
/*******************************************************************
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index fa901e3d63..67515463d1 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -140,7 +140,7 @@ static BOOL reg_match_one(struct cli_state *cli, const char *pattern, const char
if (strcmp(file,"..") == 0) file = ".";
- return ms_fnmatch(pattern, file, cli->protocol)==0;
+ return ms_fnmatch(pattern, file, cli->protocol, False) == 0;
}
static char *reg_test(struct cli_state *cli, char *pattern, char *long_name, char *short_name)