diff options
| author | Gerald Carter <jerry@samba.org> | 2001-02-08 20:41:38 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2001-02-08 20:41:38 +0000 |
| commit | 365c1d3ea49691992221d701241656df9997803a (patch) | |
| tree | d300b4ec67f236b1357cf8264aee99ddd481e0ae | |
| parent | 73b9902847cd9baa11d4f8139f316940a3240585 (diff) | |
| download | samba-365c1d3ea49691992221d701241656df9997803a.tar.gz samba-365c1d3ea49691992221d701241656df9997803a.tar.xz samba-365c1d3ea49691992221d701241656df9997803a.zip | |
Wildcard fixes for NT4 clients and DOS clients.
| -rw-r--r-- | source/smbd/dir.c | 5 | ||||
| -rw-r--r-- | source/smbd/trans2.c | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/source/smbd/dir.c b/source/smbd/dir.c index b9b3b882694..6a8cde1883d 100644 --- a/source/smbd/dir.c +++ b/source/smbd/dir.c @@ -590,6 +590,11 @@ 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) { diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index a45c2183ce5..2210b38d74c 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -375,8 +375,14 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn, pstrcpy(fname,dname); - if(!(got_match = *got_exact_match = exact_match(fname, mask, case_sensitive))) - got_match = mask_match(fname, mask, case_sensitive); + if(!(got_match = *got_exact_match = exact_match(fname, mask, case_sensitive))) { + if (!strcmp(mask, "*.*")) { + got_match = True; + } + else { + got_match = mask_match(fname, mask, case_sensitive); + } + } if(!got_match && !is_8_3(fname, False)) { |