[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  1f139ae s3:waf fix build on AIX
      from  599a699 s4:torture: let raw.read accept larger reads than 0x10000

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1f139ae2d162ebb045ce4eabb76a138baedfe44a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 18 11:52:50 2013 +0000

    s3:waf fix build on AIX
    
    AIX acl code needs to be built by default on AIX,
    otherwise smbd will fail to start because of missing symbols
    
    This fixes Bug 9557 - build succeeds, but binaries don't run
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Christian Ambach <ambi at samba.org>
    
    Autobuild-User(master): Christian Ambach <ambi at samba.org>
    Autobuild-Date(master): Thu Mar 21 16:31:19 CET 2013 on sn-devel-104

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

Summary of changes:
 source3/modules/wscript_build |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index ef5748c..8f08d52 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -63,7 +63,7 @@ bld.SAMBA3_LIBRARY('non_posix_acls',
 
 bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
                     source='vfs_aixacl_util.c',
-                    enabled=False) #fixme
+                    enabled=(bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl') or bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl2')))
 
 bld.SAMBA3_SUBSYSTEM('vfs',
                     source='',


-- 
Samba Shared Repository