POSIX ACL support is read-only, fixes to NEWS

diff --git a/NEWS b/NEWS
index d73f06e139ddb011494e725d6b2d312a7b33b577..389299662ca481b09e76b88da685e246579294e9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,10 @@
 Changes in 2.2
 ==============
 
-* UPD: AppleTalk are disabled by configure script. if use, --enable-ddp.
-* NEW: afpd: dynamic directoy cache
-* NEW: afpd: POSIX 1e ACL support
+* UPD: AppleTalk ist disabled by default at configuration time. If needed
+       use --enable-ddp.
+* NEW: afpd: dynamic directoy and CNID cache
+* NEW: afpd: read-only POSIX 1e ACL support
 * NEW: afpd: automagic Zeroconf registration with avahi, registering both
        the service _afpovertcp._tcp and TimeMachine volumes with _adisk._tcp.
 

diff --git a/etc/afpd/acls.c b/etc/afpd/acls.c
index 1ab8b7e3b6edd3a564190a33f28667c860a3dae9..a38873c804a510edd73f3675943dd2dd0686c1ea 100644 (file)
--- a/etc/afpd/acls.c
+++ b/etc/afpd/acls.c
@@ -681,13 +681,16 @@ cleanup:
 /* Removes all non-trivial ACLs from object. Returns full AFPERR code. */
 static int remove_acl(const struct vol *vol,const char *path, int dir)
 {
-    int ret;
+    int ret = AFP_OK;
 
+#ifdef HAVE_SOLARIS_ACLS
     /* Ressource etc. first */
     if ((ret = vol->vfs->vfs_remove_acl(vol, path, dir)) != AFP_OK)
         return ret;
     /* now the data fork or dir */
-    return (remove_acl_vfs(path));
+    ret = remove_acl_vfs(path);
+#endif
+    return ret;
 }
 
 /*