Fix copyfile: do nothing in the VFS

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index b7d199ca8d4af9b235b6292b803e0c790621d637..78c7a5fb3f154f485a40bff58b68d9ce57bbbc0d 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1517,6 +1517,9 @@ int copyfile(const struct vol *s_vol,
     if (err == 0)
         err = copy_fork(ADEID_DFORK, &add, adp);
 
+    if ((err == 0) && (ad_meta_fileno(adp) != -1))
+        err = d_vol->vfs->vfs_copyfile(d_vol, sfd, src, dst);
+
     if (err < 0)
        ret_err = errno;
 

diff --git a/libatalk/vfs/vfs.c b/libatalk/vfs/vfs.c
index 6cbf1463c79e4ac8cdaa140edd3e594500a3e1ec..270e2a25b5328ad35d64559d7a6a27ad93b4ebfa 100644 (file)
--- a/libatalk/vfs/vfs.c
+++ b/libatalk/vfs/vfs.c
@@ -328,6 +328,8 @@ static int RF_renamefile_adouble(VFS_FUNC_ARGS_RENAMEFILE)
 static int RF_copyfile_adouble(VFS_FUNC_ARGS_COPYFILE)
 /* const struct vol *vol, int sfd, const char *src, const char *dst */
 {
+    return 0;
+#if 0
     EC_INIT;
     bstring s = NULL, d = NULL;
     char *dup1 = NULL;
@@ -383,6 +385,7 @@ EC_CLEANUP:
     if (dup4) free(dup4);
 
     EC_EXIT;
+#endif
 }
 
 #ifdef HAVE_SOLARIS_ACLS
@@ -610,6 +613,8 @@ static int RF_deletefile_ea(VFS_FUNC_ARGS_DELETEFILE)
 }
 static int RF_copyfile_ea(VFS_FUNC_ARGS_COPYFILE)
 {
+    return 0;
+#if 0
     EC_INIT;
 
     /* copy meta EA */
@@ -694,6 +699,7 @@ EC_CLEANUP:
 #endif
 out:
     EC_EXIT;
+#endif
 }
 
 /* ---------------- */