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)

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1ddb3204d30aba9e3ae26c0d456f74d3c12a1a6d..15258e02eaf90b116b5865f5acc50b742c0d7dba 100644 (file)
--- 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)))