Changeset 745 for trunk/server/source3/modules/vfs_netatalk.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_netatalk.c (modified) (3 diffs)

trunk/server/source3/modules/vfs_netatalk.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
 
 #undef DBGC_CLASS
@@ -199 +201 @@
 }
 
+static SMB_STRUCT_DIR *atalk_fdopendir(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
+{
+        SMB_STRUCT_DIR *ret = 0;
+
+        ret = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
+
+        if (ret == NULL) {
+                return ret;
+        }
+
+        /*
+         * when we try to perform delete operation upon file which has fork
+         * in ./.AppleDouble and this directory wasn't hidden by Samba,
+         * MS Windows explorer causes the error: "Cannot find the specified file"
+         * There is some workaround to avoid this situation, i.e. if
+         * connection has not .AppleDouble entry in either veto or hide 
+         * list then it would be nice to add one.
+         */
+
+        atalk_add_to_list(&handle->conn->hide_list);
+        atalk_add_to_list(&handle->conn->veto_list);
+
+        return ret;
+}
+
 static int atalk_rmdir(struct vfs_handle_struct *handle, const char *path)
 {
@@ -433 +460 @@
 static struct vfs_fn_pointers vfs_netatalk_fns = {
         .opendir = atalk_opendir,
+        .fdopendir = atalk_fdopendir,
         .rmdir = atalk_rmdir,
         .rename = atalk_rename,