s4:dns_server: no-op dns updates with ACCESS_DENIED should be ignored

[samba.git] / source3 / modules / nfs41acl.x

diff --git a/source3/modules/nfs41acl.x b/source3/modules/nfs41acl.x
index 1a2e1d639e57fe0477fb90da0fdaec542f489767..9b3681d33458d50e5f2473708942c3b25bfecf0c 100644 (file)
--- a/source3/modules/nfs41acl.x
+++ b/source3/modules/nfs41acl.x
@@ -24,7 +24,7 @@ typedef u_int aceflag4;
  * identifiers as numerical ids instead UTF8 strings in order to avoid wasting
  * CPU cycles for the costly conversion.
  *
- * Placed in a seperate field to avoid ever running into conflicts with newly
+ * Placed in a separate field to avoid ever running into conflicts with newly
  * defined NFSv4 flags.
  */
 
@@ -70,6 +70,14 @@ const ACE4_SYNCHRONIZE          = 0x00100000;
 
 typedef u_int acemask4;
 
+/* ACL structure definition as per RFC 7530 Section-6.2.1 */
+struct nfsace4 {
+        acetype4        type;
+        aceflag4        flag;
+        acemask4        access_mask;
+        utf8str_mixed   who;
+};
+
 struct nfsace4i {
         acetype4        type;
         aceflag4        flag;
@@ -88,6 +96,15 @@ const ACL4_DEFAULTED            = 0x00000004;
 
 typedef u_int aclflag4;
 
+struct nfsacl40 {
+        nfsace4         na40_aces<>;
+};
+
+struct nfsacl41 {
+        aclflag4        na41_flag;
+        nfsace4         na41_aces<>;
+};
+
 struct nfsacl41i {
         aclflag4        na41_flag;
         nfsace4i        na41_aces<>;