AIX build fixes from William Jojo -- thanks

(cherry picked from commit cb91a47576e820390bc62195702aaae93a2feba6)

diff --git a/source/include/includes.h b/source/include/includes.h
index 15daf0e4fd9b037a8b40b1a3a9502fa0aef30836..c5dfa244b1dccafcf4312618b53cdcb9c7a1badb 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -788,6 +788,7 @@ enum flush_reason_enum {
     NUM_FLUSH_REASONS};
 
 #include "nss_info.h"
+#include "modules/nfs4_acls.h"
 #include "nsswitch/libwbclient/wbclient.h"
 
 /* generated rpc server implementation functions */

diff --git a/source/modules/vfs_aixacl2.c b/source/modules/vfs_aixacl2.c
index 996adbbdfe3b2c185776b7ad1da5a5987fc9ce6e..ecb2a096b92769f60ec2d5fb01ec556682c09c44 100644 (file)
--- a/source/modules/vfs_aixacl2.c
+++ b/source/modules/vfs_aixacl2.c
@@ -27,7 +27,7 @@
 
 extern struct current_user current_user;
 extern int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid);
-extern bool unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp,
+extern NTSTATUS unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp,
        uint32 security_info_sent, SEC_DESC *psd);
 
 extern SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
@@ -192,7 +192,7 @@ static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle,
        if (retryPosix)
        {
                DEBUG(10, ("retrying with posix acl...\n"));
-               return posix_get_nt_acl(handle->conn, name security_info,
+               return posix_get_nt_acl(handle->conn, name, security_info,
                                        ppdesc);
        }
        if (result==False)