From 93e98d02818e079c9d714e3b5a7894238ead312a Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 11 Dec 2000 22:51:57 +0000 Subject: subtle bug where files which missed the stat_cache but were added to the cache during the look returned a blank stat struct. Made weird occurrences such as... $ smbclient //pogo/print$ smb:\ > cd w32x86 ERROR: Invalid path smb:\ > cd w32x86 smb:\w32x86\ > (This used to be commit 8938dc183112b039c21a5a0beadb60068a8c5b00) --- source3/smbd/filename.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'source3/smbd/filename.c') diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index aedd2e820f..4962297428 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -387,20 +387,17 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component, } /* - * 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 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. + * * If we ended up resolving the entire path then return a valid * stat struct if we got one. */ - - if (VALID_STAT(st) && (strlen(orig_path) == strlen(name))) + if (stat_cache_lookup(conn, name, dirpath, &start, &st) + && (strlen(orig_path) == strlen(name))) { *pst = st; + } /* * The name has been resolved. -- cgit