Changeset 745 for trunk/server/source3/modules/nfs4_acls.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/nfs4_acls.h (modified) (3 diffs)

trunk/server/source3/modules/nfs4_acls.h

@@ -77 +77 @@
 #define SMB_ACE4_FAILED_ACCESS_ACE_FLAG       0x00000020
 #define SMB_ACE4_IDENTIFIER_GROUP             0x00000040
+#define SMB_ACE4_INHERITED_ACE                0x00000080
 #define SMB_ACE4_ALL_FLAGS      ( SMB_ACE4_FILE_INHERIT_ACE | SMB_ACE4_DIRECTORY_INHERIT_ACE \
 | SMB_ACE4_NO_PROPAGATE_INHERIT_ACE | SMB_ACE4_INHERIT_ONLY_ACE | SMB_ACE4_SUCCESSFUL_ACCESS_ACE_FLAG \
-| SMB_ACE4_FAILED_ACCESS_ACE_FLAG | SMB_ACE4_IDENTIFIER_GROUP )
+| SMB_ACE4_FAILED_ACCESS_ACE_FLAG | SMB_ACE4_IDENTIFIER_GROUP | SMB_ACE4_INHERITED_ACE)
 
         uint32  aceMask;        /* Access rights */
@@ -132 +133 @@
 NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
         uint32 security_info,
-        SEC_DESC **ppdesc, SMB4ACL_T *theacl);
+        struct security_descriptor **ppdesc, SMB4ACL_T *theacl);
 
 NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
         const char *name,
         uint32 security_info,
-        SEC_DESC **ppdesc, SMB4ACL_T *theacl);
+        struct security_descriptor **ppdesc, SMB4ACL_T *theacl);
 
 /* Callback function needed to set the native acl
@@ -145 +146 @@
 NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
         uint32 security_info_sent,
-        const SEC_DESC *psd,
+        const struct security_descriptor *psd,
         set_nfs4acl_native_fn_t set_nfs4_native);