summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-05-26 19:37:31 +0000
committerJeremy Allison <jra@samba.org>1998-05-26 19:37:31 +0000
commit1d16f750515bcf49e0dc87394479dc56e7192538 (patch)
tree43dc3e4498e941ffa44bec5801dc9b14643c91ff /source3/smbd
parent863c787b020eaf2dc648f51087f5ce3d2c82ab2c (diff)
downloadsamba-1d16f750515bcf49e0dc87394479dc56e7192538.tar.gz
samba-1d16f750515bcf49e0dc87394479dc56e7192538.tar.bz2
samba-1d16f750515bcf49e0dc87394479dc56e7192538.zip
smb.h: More NT SMB stuff (just defines).
smbpass.c: Do *NOT* make this function static. It breaks the compile on gcc util.c: Getting closer to MS wildcard semantics. A trailing '*' matches any trailing dot-separated components. trans2.c: Removed hacks that change multiple '?' -> '*' as this breaks things now. trans2.h: Removed NT_FILE_ATTRIBUTE_NORMAL - now FILE_ATTRIBUTE_NORMAL is defined in smb.h. Jeremy. (This used to be commit 42a65511068cd9006350c80bbed2f346f3f01cb0)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/trans2.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 4c06377bda..4fefb4b39c 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -401,7 +401,7 @@ static int get_lanman2_dir_entry(int cnum,char *path_mask,int dirtype,int info_l
p = pdata;
nameptr = p;
- nt_extmode = mode ? mode : NT_FILE_ATTRIBUTE_NORMAL;
+ nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
switch (info_level)
{
@@ -693,13 +693,21 @@ static int call_trans2findfirst(char *inbuf, char *outbuf, int bufsize, int cnum
p++;
}
}
-
+
+#if 0 /* JRA */
+ /*
+ * Now we have a working mask_match in util.c, I believe
+ * we no longer need these hacks (in fact they break
+ * things). JRA.
+ */
+
/* a special case for 16 bit apps */
if (strequal(mask,"????????.???")) pstrcpy(mask,"*");
/* handle broken clients that send us old 8.3 format */
string_sub(mask,"????????","*");
string_sub(mask,".???",".*");
+#endif /* JRA */
/* Save the wildcard match and attribs we are using on this directory -
needed as lanman2 assumes these are being saved between calls */