diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/client/client.c | 8 | ||||
| -rw-r--r-- | source4/ntvfs/cifs_posix_cli/svfs_util.c | 3 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_dirlist.c | 12 | ||||
| -rw-r--r-- | source4/ntvfs/simple/svfs_util.c | 3 | ||||
| -rw-r--r-- | source4/torture/masktest.c | 3 |
5 files changed, 19 insertions, 10 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 9866444b006..10d027b5e0b 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -311,12 +311,14 @@ static bool mask_match(struct smbcli_state *c, const char *string, return false; if (is_case_sensitive) - return ms_fnmatch_protocol(pattern, string, - c->transport->negotiate.protocol) == 0; + 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) == 0; + ret = ms_fnmatch_protocol(p2, s2, c->transport->negotiate.protocol, + true) == 0; talloc_free(p2); talloc_free(s2); 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; } diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index b96c6dabbe5..e6e7f4e4245 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -49,7 +49,8 @@ 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)==0; + return ms_fnmatch_protocol( + pattern, file, cli->transport->negotiate.protocol, true)==0; } static char *reg_test(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char *pattern, const char *long_name, const char *short_name) |