summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2016-10-25 11:53:53 +0200
committerRalph Boehme <slow@samba.org>2017-01-22 18:30:12 +0100
commitf969be54417a0d4d2bab0f854ce1c9f9d4639711 (patch)
treee542d9409e8d21f43c71f47413da9e70b42b90ee /source4/ntvfs
parent07d9a909ba6853fb0b96f6d86e4cf0d5d1b35b28 (diff)
downloadsamba-f969be54417a0d4d2bab0f854ce1c9f9d4639711.tar.gz
lib: Add "is_case_sensitive" to ms_fnmatch_protocol
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/cifs_posix_cli/svfs_util.c3
-rw-r--r--source4/ntvfs/posix/pvfs_dirlist.c12
-rw-r--r--source4/ntvfs/simple/svfs_util.c3
3 files changed, 12 insertions, 6 deletions
diff --git a/source4/ntvfs/cifs_posix_cli/svfs_util.c b/source4/ntvfs/cifs_posix_cli/svfs_util.c
index cf881a1c9ae..ec2e9330806 100644
--- a/source4/ntvfs/cifs_posix_cli/svfs_util.c
+++ b/source4/ntvfs/cifs_posix_cli/svfs_util.c
@@ -105,7 +105,8 @@ struct cifspsx_dir *cifspsx_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request
if (!low_name) { continue; }
/* check it matches the wildcard pattern */
- if (ms_fnmatch_protocol(low_mask, low_name, PROTOCOL_NT1) != 0) {
+ if (ms_fnmatch_protocol(low_mask, low_name, PROTOCOL_NT1,
+ true) != 0) {
continue;
}
diff --git a/source4/ntvfs/posix/pvfs_dirlist.c b/source4/ntvfs/posix/pvfs_dirlist.c
index 1bc91c1c788..d86fce4e852 100644
--- a/source4/ntvfs/posix/pvfs_dirlist.c
+++ b/source4/ntvfs/posix/pvfs_dirlist.c
@@ -199,7 +199,8 @@ const char *pvfs_list_next(struct pvfs_dir *dir, off_t *ofs)
if (*ofs == DIR_OFFSET_DOT) {
(*ofs) = DIR_OFFSET_DOTDOT;
dir->offset = *ofs;
- if (ms_fnmatch_protocol(dir->pattern, ".", protocol) == 0) {
+ if (ms_fnmatch_protocol(dir->pattern, ".", protocol,
+ true) == 0) {
dcache_add(dir, ".");
return ".";
}
@@ -208,7 +209,8 @@ const char *pvfs_list_next(struct pvfs_dir *dir, off_t *ofs)
if (*ofs == DIR_OFFSET_DOTDOT) {
(*ofs) = DIR_OFFSET_BASE;
dir->offset = *ofs;
- if (ms_fnmatch_protocol(dir->pattern, "..", protocol) == 0) {
+ if (ms_fnmatch_protocol(dir->pattern, "..", protocol,
+ true) == 0) {
dcache_add(dir, "..");
return "..";
}
@@ -228,10 +230,12 @@ const char *pvfs_list_next(struct pvfs_dir *dir, off_t *ofs)
continue;
}
- if (ms_fnmatch_protocol(dir->pattern, dname, protocol) != 0) {
+ if (ms_fnmatch_protocol(dir->pattern, dname, protocol,
+ true) != 0) {
char *short_name = pvfs_short_name_component(dir->pvfs, dname);
if (short_name == NULL ||
- ms_fnmatch_protocol(dir->pattern, short_name, protocol) != 0) {
+ ms_fnmatch_protocol(dir->pattern, short_name,
+ protocol, true) != 0) {
talloc_free(short_name);
continue;
}
diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index 171813bea21..21f20c58ac8 100644
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/ntvfs/simple/svfs_util.c
@@ -101,7 +101,8 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request *req,
if (!low_name) { continue; }
/* check it matches the wildcard pattern */
- if (ms_fnmatch_protocol(low_mask, low_name, PROTOCOL_NT1) != 0) {
+ if (ms_fnmatch_protocol(low_mask, low_name, PROTOCOL_NT1,
+ true) != 0) {
continue;
}