summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-12-12 09:10:01 +0000
committerJeremy Allison <jra@samba.org>1997-12-12 09:10:01 +0000
commit164c9db4de87ea851a631f1c9d431e0a4525802e (patch)
tree399b4e5bb53e08563244bf04a858d03aff11833e
parent155562e514ca0abc537f53b612a7df13461829ac (diff)
downloadsamba-164c9db4de87ea851a631f1c9d431e0a4525802e.tar.gz
samba-164c9db4de87ea851a631f1c9d431e0a4525802e.tar.bz2
samba-164c9db4de87ea851a631f1c9d431e0a4525802e.zip
Fixed bug reported by Gert-Jan Vons <Gert-Jan.Vons@ocegr.fr>
with doing a dir /s into a unix directory ending in a ':'. Jeremy. (This used to be commit 273978b7d72955efcc0e0d9e87438b45f51c163d)
-rw-r--r--source3/smbd/server.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1ddb3204d3..15258e02ea 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -452,8 +452,20 @@ static BOOL scan_directory(char *path, char *name,int cnum,BOOL docache)
return(True);
}
+#if 0
+ /*
+ * This code I believe is incorrect - and commenting it out
+ * is the correct fix for the bug mentioned below in the
+ * comment 'name2 here was changed to dname - since 1.9.16p2 - not sure of reason (jra)'.
+ * The incoming name can be mangled, and if we de-mangle it
+ * here it will not compare correctly against the filename (name2)
+ * read from the directory and then mangled by the name_map_mangle()
+ * call. We need to mangle both names or neither.
+ * (JRA).
+ */
if (mangled)
check_mangled_stack(name);
+#endif
/* open the directory */
if (!(cur_dir = OpenDir(cnum, path, True)))