Sorry Gerald, I think the original code was better (plus safer as I'm sure

it's working :-).
Jeremy.
(This used to be commit e18c104ee35d00dcbe2e73e6c9699300a3947364)

1 files changed, 10 insertions, 7 deletions

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 4962297428..aedd2e820f 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -387,17 +387,20 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component,
   }
   
   /*
-   * If we get to here, the filename should have ben added 
-   * to the stat_cache.  Therefore a stat_cache_lookup() is needed here
-   * to fill in the SMB_STRUCT_STAT.
-   *
+   * Don't cache a name with mangled or wildcard components
+   * as this can change the size.
+   */
+
+  if(!component_was_mangled && !name_has_wildcard)
+    stat_cache_add(orig_path, name);
+
+  /*
    * If we ended up resolving the entire path then return a valid
    * stat struct if we got one.
    */
-  if (stat_cache_lookup(conn, name, dirpath, &start, &st) 
-       && (strlen(orig_path) == strlen(name))) {
+
+  if (VALID_STAT(st) && (strlen(orig_path) == strlen(name)))
     *pst = st;
-  }
 
   /* 
    * The name has been resolved.