X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fvfs%2Fvfs.c;h=ebdf75e24b0daef17c157ab7a5dc447770cb465b;hb=0af785317766d0faaff34c6b83d0435951ff3788;hp=c2647ceca0f674dcd628bfc2329f6c6ca37ae031;hpb=90363daa8537bf00ea62c8b7a665eeeb80f62ff0;p=netatalk.git

diff --git a/libatalk/vfs/vfs.c b/libatalk/vfs/vfs.c
index c2647cec..ebdf75e2 100644
--- a/libatalk/vfs/vfs.c
+++ b/libatalk/vfs/vfs.c
@@ -336,11 +336,11 @@ static int RF_solaris_acl(VFS_FUNC_ARGS_ACL)
 	if ((acl(buf, cmd, count, aces)) != 0)
 	    return -1;
 	/* now set ACL on ressource fork */
-	if ((acl(vol->vfs->ad_path(path, ADFLAGS_DIR), cmd, count, aces)) != 0)
+	if ((acl(vol->ad_path(path, ADFLAGS_DIR), cmd, count, aces)) != 0)
 	    return -1;
     } else
 	/* set ACL on ressource fork */
-	if ((acl(vol->vfs->ad_path(path, ADFLAGS_HF), cmd, count, aces)) != 0)
+	if ((acl(vol->ad_path(path, ADFLAGS_HF), cmd, count, aces)) != 0)
 	    return -1;
 
     return 0;
@@ -357,14 +357,14 @@ static int RF_solaris_remove_acl(VFS_FUNC_ARGS_REMOVE_ACL)
 	if (len < 0 || len >=  MAXPATHLEN)
 	    return AFPERR_MISC;
 	/* remove ACL from .AppleDouble/.Parent first */
-	if ((ret = remove_acl(vol->vfs->ad_path(path, ADFLAGS_DIR))) != AFP_OK)
+	if ((ret = remove_acl(vol->ad_path(path, ADFLAGS_DIR))) != AFP_OK)
 	    return ret;
 	/* now remove from .AppleDouble dir */
 	if ((ret = remove_acl(buf)) != AFP_OK)
 	    return ret;
     } else
 	/* remove ACL from ressource fork */
-	if ((ret = remove_acl(vol->vfs->ad_path(path, ADFLAGS_HF))) != AFP_OK)
+	if ((ret = remove_acl(vol->ad_path(path, ADFLAGS_HF))) != AFP_OK)
 	    return ret;
 
     return AFP_OK;
@@ -936,7 +936,7 @@ static struct vfs_ops netatalk_ea_sys = {
     /* rf_setdirowner:    */ NULL,
     /* rf_deletefile:     */ NULL,
     /* rf_renamefile:     */ NULL,
-    /* vfs_copyfile:      */ NULL,
+    /* vfs_copyfile:      */ sys_ea_copyfile,
     /* rf_acl:            */ NULL,
     /* rf_remove_acl      */ NULL,
     /* ea_getsize         */ sys_get_easize,
@@ -964,7 +964,7 @@ static struct vfs_ops netatalk_solaris_acl_adouble = {
     /* rf_renamefile:     */ NULL,
     /* vfs_copyfile       */ NULL,
     /* rf_acl:            */ RF_solaris_acl,
-    /* rf_remove_acl      */ RF_remove_acl,
+    /* rf_remove_acl      */ RF_solaris_remove_acl,
     NULL
 };
 #endif
@@ -993,7 +993,6 @@ void initvol_vfs(struct vol *vol)
         LOG(log_debug, logtype_afpd, "initvol_vfs: Enabling EA support with native EAs.");
         vol->vfs_modules[1] = &netatalk_ea_sys;
     } else {
-        /* default: AFPVOL_EA_AD */
         LOG(log_debug, logtype_afpd, "initvol_vfs: Enabling EA support with adouble files.");
         vol->vfs_modules[1] = &netatalk_ea_adouble;
     }