Second part of fix for bug #8541 - readlink() on Linux clients fails if the symlink...

[kai/samba.git] / source3 / smbd / statcache.c

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index bb3b0701199ac9e6b45683824d54424dde4a39f9..92010c230ddfca8786f15da0d62acd700e186914 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -21,10 +21,11 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "memcache.h"
 #include "smbd/smbd.h"
 #include "messages.h"
+#include "smbprofile.h"
+#include "tdb_compat.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.
@@ -149,6 +150,7 @@ void stat_cache_add( const char *full_orig_name,
  * Look through the stat cache for an entry
  *
  * @param conn    A connection struct to do the stat() with.
+ * @param posix_paths Whether to lookup using stat() or lstat()
  * @param name    The path we are attempting to cache, modified by this routine
  *                to be correct as far as the cache can tell us. We assume that
  *               it is a talloc'ed string from top of stack, we free it if
@@ -165,6 +167,7 @@ void stat_cache_add( const char *full_orig_name,
  */
 
 bool stat_cache_lookup(connection_struct *conn,
+                       bool posix_paths,
                        char **pp_name,
                        char **pp_dirpath,
                        char **pp_start,
@@ -180,6 +183,7 @@ bool stat_cache_lookup(connection_struct *conn,
        char *name;
        TALLOC_CTX *ctx = talloc_tos();
        struct smb_filename smb_fname;
+       int ret;
 
        *pp_dirpath = NULL;
        *pp_start = *pp_name;
@@ -282,7 +286,13 @@ bool stat_cache_lookup(connection_struct *conn,
        ZERO_STRUCT(smb_fname);
        smb_fname.base_name = translated_path;
 
-       if (SMB_VFS_STAT(conn, &smb_fname) != 0) {
+       if (posix_paths) {
+               ret = SMB_VFS_LSTAT(conn, &smb_fname);
+       } else {
+               ret = SMB_VFS_STAT(conn, &smb_fname);
+       }
+
+       if (ret != 0) {
                /* Discard this entry - it doesn't exist in the filesystem. */
                memcache_delete(smbd_memcache(), STAT_CACHE,
                                data_blob_const(chk_name, strlen(chk_name)));
@@ -339,8 +349,8 @@ bool stat_cache_lookup(connection_struct *conn,
  Tell all smbd's to delete an entry.
 **************************************************************************/
 
-void send_stat_cache_delete_message(struct messaging_context *msg_ctx,
-                                   const char *name)
+void smbd_send_stat_cache_delete_message(struct messaging_context *msg_ctx,
+                                        const char *name)
 {
 #ifdef DEVELOPER
        message_send_all(msg_ctx,