From 90d7bc6da3c92e104fadd5965a730fbe01be33d5 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 12 Jun 2008 12:36:15 +0200 Subject: [PATCH] AIX build fixes from William Jojo -- thanks (cherry picked from commit cb91a47576e820390bc62195702aaae93a2feba6) --- source/include/includes.h | 1 + source/modules/vfs_aixacl2.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/include/includes.h b/source/include/includes.h index adbf8f791df..c937f597cd8 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -777,6 +777,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 62675ae631e..ffcec7ccaac 100644 --- 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)