s3:utils: let smbstatus report anonymous signing/encryption explicitly

[samba.git] / source3 / modules / README.nfs4acls.txt

diff --git a/source3/modules/README.nfs4acls.txt b/source3/modules/README.nfs4acls.txt
index 3594aafee8e3ee893c973db389d7b726737e805b..6de87a1fe6ef8cc0e0c74f2c786b7d29d40c4ffb 100644 (file)
--- a/source3/modules/README.nfs4acls.txt
+++ b/source3/modules/README.nfs4acls.txt
@@ -2,7 +2,7 @@ Configuring NFS4 ACLs in Samba3
 ===============================
 Created: Peter Somogyi, 2006-JUN-06
 Last modified: Alexander Werth, 2013-MAY-02
-Revision no.: 4 
+Revision no.: 4
 -------------------------------
 
 
@@ -33,10 +33,10 @@ chown = [true|false]
 - false => disable support for changing owner or group
 
 acedup = [dontcare|reject|ignore|merge]
-- dontcare: copy ACEs as they come, don't care with "duplicate" records. Default.
-- reject: stop operation, exit acl setter operation with an error
-- ignore: don't include the second matching ACE
-- merge: OR 2 ace.flag fields and 2 ace.mask fields of the 2 duplicate ACEs into 1 ACE
+- dontcare: copy ACEs as they come, don't care with "duplicate" records.
+- reject: stop operation, exit acl setter operation with an error. (deprecated)
+- ignore: don't include the second matching ACE. (deprecated)
+- merge: OR 2 ace.flag fields and 2 ace.mask fields of the 2 duplicate ACEs into 1 ACE (default)
 
 Two ACEs are considered here "duplicate" when their type and id fields are matching.
 
@@ -69,12 +69,12 @@ General notes
 
 NFS4 handling logic is separated from AIX/jfs2 ACL parsing.
 
-Samba and its VFS modules dosn't reorder ACEs. Windows clients do that (and the smbcacl tool). MSDN also says deny ACEs must come first.
+Samba and its VFS modules don't reorder ACEs. Windows clients do that (and the smbcacl tool). MSDN also says deny ACEs must come first.
 NFS4 ACL's validity is checked by the system API, not by Samba.
 NFS4 ACL rights are enforced by the OS or filesystem, not by Samba.
 
 The flag INHERITED_ACE is never set (not required, as doesn't do WinNT/98/me, only since Win2k).
-Win2k GUI behaves strangely when detecting inheritance (sometimes it doesn't detect, 
+Win2k GUI behaves strangely when detecting inheritance (sometimes it doesn't detect,
 but after adding an ace it shows that - it's some GUI error).
 
 Unknown (unmappable) SIDs are not accepted.
@@ -83,7 +83,7 @@ TODOs
 =====
 - Creator Owner & Group SID handling (same way as posix)
 - the 4 generic rights bits support (GENERIC_RIGHT_READ_ACCESS, WRITE, EXEC, ALL)
-- chown & no ACL, but we have ONWER@ and GROUP@
+- chown & no ACL, but we have OWNER@ and GROUP@
 - DIALUP, ANONYMOUS, ... builtin SIDs
 - audit & alarm support - in theory it's forwarded so it should work, but currently there's no platform which supports them to test
 - support for a real NFS4 client (we don't have an accepted API yet)