summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-02-08 20:47:09 +0000
committerGerald Carter <jerry@samba.org>2001-02-08 20:47:09 +0000
commit01634eaf129e90877c054664703d100be9f41ce0 (patch)
tree9cfb964b96379461f619b00e669b7b14e75cbf25
parent607ea0d6fa00b5a9f1dea0542c039411e60f0db4 (diff)
downloadsamba-01634eaf129e90877c054664703d100be9f41ce0.tar.gz
samba-01634eaf129e90877c054664703d100be9f41ce0.tar.bz2
samba-01634eaf129e90877c054664703d100be9f41ce0.zip
merge from SAMBA_2_2
(This used to be commit 9347121ce6888afeae3cdf256b5f0c5b9c58b0bc)
-rw-r--r--source3/smbd/dir.c5
-rw-r--r--source3/smbd/trans2.c10
2 files changed, 13 insertions, 2 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index b9b3b88269..6a8cde1883 100644
--- a/source3/smbd/dir.c
+++ b/source3/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/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a45c2183ce..2210b38d74 100644
--- a/source3/smbd/trans2.c
+++ b/source3/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)) {