sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib: Fix "is_case_sensitive" in "ms_fnmatch_protocol"' callers

Browse Source 
In the optimization in f969be5441 I got the boolean flag "is_case_sensitive"
wrong. The behaviour was case *insensitive*, so all the flags should have been
"false", keeping the old behaviour.  While there, simplify "mask_match" in
source4 client.c

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Wed Feb 15 11:40:32 CET 2017 on sn-devel-144
This commit is contained in:
Volker Lendecke 2017-02-12 20:12:10 +01:00
parent e08110ece6
commit 129015d1a6
5 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source4/client/client.c
View File

@ -302,27 +302,17 @@ static int cmd_cd(struct smbclient_context *ctx, const char **args)
static bool mask_match(struct smbcli_state *c, const char *string,
const char *pattern, bool is_case_sensitive)
{
char *p2, *s2;
bool ret;
int ret;
if (ISDOTDOT(string))
string = ".";
if (ISDOT(pattern))
return false;
if (is_case_sensitive)
return ms_fnmatch_protocol(
pattern, string, c->transport->negotiate.protocol,
true) == 0;
p2 = strlower_talloc(NULL, pattern);
s2 = strlower_talloc(NULL, string);
ret = ms_fnmatch_protocol(p2, s2, c->transport->negotiate.protocol,
true) == 0;
talloc_free(p2);
talloc_free(s2);
return ret;
ret = ms_fnmatch_protocol(pattern, string,
c->transport->negotiate.protocol,
is_case_sensitive);
return (ret == 0);
}

2
source4/ntvfs/cifs_posix_cli/svfs_util.c
View File

@ -106,7 +106,7 @@ struct cifspsx_dir *cifspsx_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request
/* check it matches the wildcard pattern */
if (ms_fnmatch_protocol(low_mask, low_name, PROTOCOL_NT1,
true) != 0) {
false) != 0) {
continue;
}

8
source4/ntvfs/posix/pvfs_dirlist.c
View File

@ -200,7 +200,7 @@ const char *pvfs_list_next(struct pvfs_dir *dir, off_t *ofs)
(*ofs) = DIR_OFFSET_DOTDOT;
dir->offset = *ofs;
if (ms_fnmatch_protocol(dir->pattern, ".", protocol,
true) == 0) {
false) == 0) {
dcache_add(dir, ".");
return ".";
}
@ -210,7 +210,7 @@ const char *pvfs_list_next(struct pvfs_dir *dir, off_t *ofs)
(*ofs) = DIR_OFFSET_BASE;
dir->offset = *ofs;
if (ms_fnmatch_protocol(dir->pattern, "..", protocol,
true) == 0) {
false) == 0) {
dcache_add(dir, "..");
return "..";
}
@ -231,11 +231,11 @@ const char *pvfs_list_next(struct pvfs_dir *dir, off_t *ofs)
}
if (ms_fnmatch_protocol(dir->pattern, dname, protocol,
true) != 0) {
false) != 0) {
char *short_name = pvfs_short_name_component(dir->pvfs, dname);
if (short_name == NULL ||
ms_fnmatch_protocol(dir->pattern, short_name,
protocol, true) != 0) {
protocol, false) != 0) {
talloc_free(short_name);
continue;
}

2
source4/ntvfs/simple/svfs_util.c
View File

@ -102,7 +102,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request *req,
/* check it matches the wildcard pattern */
if (ms_fnmatch_protocol(low_mask, low_name, PROTOCOL_NT1,
true) != 0) {
false) != 0) {
continue;
}

2
source4/torture/masktest.c
View File

@ -50,7 +50,7 @@ static bool reg_match_one(struct smbcli_state *cli, const char *pattern, const c
if (ISDOTDOT(file)) file = ".";
return ms_fnmatch_protocol(
pattern, file, cli->transport->negotiate.protocol, true)==0;
pattern, file, cli->transport->negotiate.protocol, false)==0;
}
static char *reg_test(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char *pattern, const char *long_name, const char *short_name)