[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-2822-g90d7bc6
Volker Lendecke
vlendec at samba.org
Thu Jun 12 11:16:22 GMT 2008
The branch, v3-3-test has been updated
via 90d7bc6da3c92e104fadd5965a730fbe01be33d5 (commit)
via 5ffad12d68288eca4756519ec7ab90995a277517 (commit)
from f4850c37df166c3ab4ec3c532aefd87b5c7e2ad8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 90d7bc6da3c92e104fadd5965a730fbe01be33d5
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 12 12:36:15 2008 +0200
AIX build fixes from William Jojo -- thanks
(cherry picked from commit cb91a47576e820390bc62195702aaae93a2feba6)
commit 5ffad12d68288eca4756519ec7ab90995a277517
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 12 12:35:28 2008 +0200
Add -brtl to the AIX linker flags
Thanks to William Jojo
(cherry picked from commit 74b195b54416d9e3eb46079a71eed31a15c7293a)
-----------------------------------------------------------------------
Summary of changes:
source/configure.in | 4 +++-
source/include/includes.h | 1 +
source/modules/vfs_aixacl2.c | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 8c00d39..358d9da 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1618,7 +1618,9 @@ DSO_EXPORTS=""
;;
*aix*) AC_DEFINE(AIX,1,[Whether the host os is aix])
BLDSHARED="true"
- LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc"
+ # use expfull to export underscored symbols
+ # add rtl to remove /lib/crt0.o warning
+ LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc,-brtl"
DYNEXP="-Wl,-brtl,-bexpfull,-bbigtoc"
PICFLAG="-O2"
# as AIX code is always position independent...
diff --git a/source/include/includes.h b/source/include/includes.h
index adbf8f7..c937f59 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 62675ae..ffcec7c 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)
--
Samba Shared Repository
More information about the samba-cvs
mailing list