Changeset 745 for trunk/server/source3/modules/vfs_aixacl2.c

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/vfs_aixacl2.c (modified) (5 diffs)

trunk/server/source3/modules/vfs_aixacl2.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "nfs4_acls.h"
 
@@ -156 +157 @@
 static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle,
         files_struct *fsp, uint32 security_info,
-        SEC_DESC **ppdesc)
+        struct security_descriptor **ppdesc)
 {
         SMB4ACL_T *pacl = NULL;
@@ -178 +179 @@
 static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle,
         const char *name,
-        uint32 security_info, SEC_DESC **ppdesc)
+        uint32 security_info, struct security_descriptor **ppdesc)
 {
         SMB4ACL_T *pacl = NULL;
@@ -371 +372 @@
 }
 
-static NTSTATUS aixjfs2_set_nt_acl_common(files_struct *fsp, uint32 security_info_sent, const SEC_DESC *psd)
+static NTSTATUS aixjfs2_set_nt_acl_common(files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)
 {
         acl_type_t      acl_type_info;
@@ -395 +396 @@
 }
 
-NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const SEC_DESC *psd)
+NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)
 {
         return aixjfs2_set_nt_acl_common(fsp, security_info_sent, psd);