diff options
| author | Jeremy Allison <jra@samba.org> | 2005-03-24 19:33:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:18 -0500 |
| commit | 445a9729f03117afdaa141a6d074d8af064b4399 (patch) | |
| tree | 2566a2fa851e77ac4df41a359ded2c0b3919eba8 /source3/smbd/dir.c | |
| parent | 0a11209325caf24ef7f09c963c4795147b62fdd2 (diff) | |
| download | samba-445a9729f03117afdaa141a6d074d8af064b4399.tar.gz samba-445a9729f03117afdaa141a6d074d8af064b4399.tar.bz2 samba-445a9729f03117afdaa141a6d074d8af064b4399.zip | |
r6044: Ensure the old search calls always ask mask_match to translate
patterns like ????????.??? - even if using an NT1 protocol.
Matches W2K3 behavior.
Jeremy.
(This used to be commit 67f6473f50f3284b9ccbe6f983f23cd42b3b7c9f)
Diffstat (limited to 'source3/smbd/dir.c')
| -rw-r--r-- | source3/smbd/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 6ecdcec461..55f1523865 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -698,7 +698,7 @@ BOOL dir_check_ftype(connection_struct *conn,int mode,int dirtype) static BOOL mangle_mask_match(connection_struct *conn, fstring filename, char *mask) { mangle_map(filename,True,False,SNUM(conn)); - return mask_match(filename,mask,False); + return mask_match_search(filename,mask,False); } /**************************************************************************** @@ -740,7 +740,7 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype, pstring fname see masktest for a demo */ if ((strcmp(mask,"*.*") == 0) || - mask_match(filename,mask,False) || + mask_match_search(filename,mask,False) || mangle_mask_match(conn,filename,mask)) { if (!mangle_is_8_3(filename, False)) |