diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-12 12:36:15 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-06-12 13:17:44 +0200 |
| commit | de7e6e070a95c9543befd95f6f5576f056a701a7 (patch) | |
| tree | 5c3828cd7cad7a6ec33833e6bcbb22465bf9bba5 /source3 | |
| parent | 67f3ee618b2ae4968f2afadbf9b69174c7f7feb7 (diff) | |
| download | samba-de7e6e070a95c9543befd95f6f5576f056a701a7.tar.gz samba-de7e6e070a95c9543befd95f6f5576f056a701a7.tar.bz2 samba-de7e6e070a95c9543befd95f6f5576f056a701a7.zip | |
AIX build fixes from William Jojo -- thanks
(cherry picked from commit cb91a47576e820390bc62195702aaae93a2feba6)
(This used to be commit 90d7bc6da3c92e104fadd5965a730fbe01be33d5)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_aixacl2.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index adbf8f791d..c937f597cd 100644 --- a/source3/include/includes.h +++ b/source3/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/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index 62675ae631..ffcec7ccaa 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/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) |