Doc update for removed aclmode in ZFS

diff --git a/NEWS b/NEWS
index f801444b30eae20f5346e67adcee94c3b0722ba6..d00d61dbe67f30d7b16f9ac286f982c7b5a3931d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Changes in 2.1.5
 ================
 * UPD: afpd: support newlines in -loginmesg with \n escaping syntax
+* UPD: afpd: support for changed chmod semantics on ZFS with ACLs
+       in onnv145+
 
 Changes in 2.1.4
 ================

diff --git a/doc/README.ACLs b/doc/README.ACLs
index 6c477251f354a99024eec48fd4eba6ab15084fde..916ddbed968a97841a96cf75338d229a2f163c53 100644 (file)
--- a/doc/README.ACLs
+++ b/doc/README.ACLs
@@ -17,10 +17,9 @@ In order to be able to support ACLs, the following things have to be configured:
 
   1. ZFS Volumes:
 
-     You MUST configure two ACL parameters for any volume you want to use with Netatalk:
+     You MUST configure one ACL parameter for any volume you want to use with Netatalk:
 
         aclinherit = passthrough
-        aclmode = passthrough
 
      For an explanation of what these parameters mean and how to apply them see, your hosts
      ZFS documentation (e.g. man zfs).
@@ -36,14 +35,7 @@ In order to be able to support ACLs, the following things have to be configured:
       - you need an Open Directory Server or an LDAP server where you store UUIDs in some
        attribute
       - your clients must be configured to use this server 
-      - your server should be configured to use this server via nsswitch and PAM. This
-       however is not a strict requirement: 
-       if you create duplicates of every LDAP/OD user and group with identic attributes
-       (name, uid, gid) in your local data store (/etc/[passwd|group]) things will work
-
-             *  as long as user/group names/ids in the filesystem are equal  *
-             *         to their counterparts in the LDAP/OD datastore        *
-
+      - your server should be configured to use this server via nsswitch and PAM
       - configure Netatalk via afp_ldap.conf so that Netatalk is able to retrieve the UUID
        for users and groups via LDAP search queries