summaryrefslogtreecommitdiff
path: root/source3/smbd/dir.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-10-31 20:11:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:15 -0500
commit6baec64a7370ff1871f0b806a623b1fc1a898acb (patch)
treebd4ac368bbc4deaabab528f5ef7ea7214c764042 /source3/smbd/dir.c
parent7ec71aa20d43fd45dd9321e42ada93ee10fd1d45 (diff)
downloadsamba-6baec64a7370ff1871f0b806a623b1fc1a898acb.tar.gz
samba-6baec64a7370ff1871f0b806a623b1fc1a898acb.tar.bz2
samba-6baec64a7370ff1871f0b806a623b1fc1a898acb.zip
r11420: Fix issue pointed out by Dina Fine <dina@exanet.com>. We can
only tell at parse time from the wire if an incoming name has wildcards or not. If it's a mangled name and we demangle the demangled name may contain wildcard characters. Ensure these are ignored. Jeremy. (This used to be commit 4cd8e2a96b98ff711905e8c6f416b22440c16062)
Diffstat (limited to 'source3/smbd/dir.c')
-rw-r--r--source3/smbd/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 70a3b81ad6..7ea97e69b0 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -382,7 +382,7 @@ static void dptr_close_oldest(BOOL old)
****************************************************************************/
int dptr_create(connection_struct *conn, pstring path, BOOL old_handle, BOOL expect_close,uint16 spid,
- const char *wcard, uint32 attr)
+ const char *wcard, BOOL wcard_has_wild, uint32 attr)
{
struct dptr_struct *dptr = NULL;
struct smb_Dir *dir_hnd;
@@ -500,7 +500,7 @@ int dptr_create(connection_struct *conn, pstring path, BOOL old_handle, BOOL exp
if (lp_posix_pathnames() || (wcard[0] == '.' && wcard[1] == 0)) {
dptr->has_wild = True;
} else {
- dptr->has_wild = ms_has_wild(wcard);
+ dptr->has_wild = wcard_has_wild;
}
dptr->attr = attr;