[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2559-gcb91a47

Volker Lendecke vlendec at samba.org
Thu Jun 12 11:14:15 GMT 2008


The branch, v3-2-test has been updated
       via  cb91a47576e820390bc62195702aaae93a2feba6 (commit)
       via  74b195b54416d9e3eb46079a71eed31a15c7293a (commit)
      from  82c994dabc47bb4755c883a1f3651bb5d65cf2c5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit cb91a47576e820390bc62195702aaae93a2feba6
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 12 12:36:15 2008 +0200

    AIX build fixes from William Jojo -- thanks

commit 74b195b54416d9e3eb46079a71eed31a15c7293a
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

-----------------------------------------------------------------------

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 e015f9e..9d247ad 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1600,7 +1600,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 15daf0e..c5dfa24 100644
--- 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 996adbb..ecb2a09 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