diff options
| author | Jeremy Allison <jra@samba.org> | 2001-03-10 20:52:43 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-03-10 20:52:43 +0000 |
| commit | e5df481e5ac2ace27ea917f975092d7c3e53823d (patch) | |
| tree | 71ac6370741ba29128bf2f680906bed176dc06ac | |
| parent | 5a9cffcf4b62ef88fc15688f780d296adb4fb818 (diff) | |
| download | samba-e5df481e5ac2ace27ea917f975092d7c3e53823d.tar.gz samba-e5df481e5ac2ace27ea917f975092d7c3e53823d.tar.xz samba-e5df481e5ac2ace27ea917f975092d7c3e53823d.zip | |
Removed incorrect substitution in dir code - move to DOS fnmatch.
Jeremy.
| -rw-r--r-- | source/lib/util.c | 3 | ||||
| -rw-r--r-- | source/smbd/dir.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/lib/util.c b/source/lib/util.c index b1214bacb68..5aae78aa152 100644 --- a/source/lib/util.c +++ b/source/lib/util.c @@ -1821,6 +1821,9 @@ int dos_fnmatch(char *string, char *pattern) if (strcmp(pattern, "*.*")) return 1; + if (strequal(mask, "????????.???")) + pstrcpy(mask, "*"); + return ms_fnmatch(string, pattern); } diff --git a/source/smbd/dir.c b/source/smbd/dir.c index 0012d7b7886..5bf0dec9444 100644 --- a/source/smbd/dir.c +++ b/source/smbd/dir.c @@ -589,11 +589,6 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname, if (!conn->dirptr) return(False); - if (strequal(mask, "????????.???")) - pstrcpy(mask, "*"); - - - while (!found) { dname = ReadDirName(conn->dirptr); |