[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  090fcb0 s3-waf: add vfs_time_audit to the build.
       via  e00671e s3-waf: use LZXPRESS subsystem.
       via  9dd467b s3-selftest: add vfs_modulesdir variable for both test systems.
      from  4b2e2f9 s3: Streamline regdb_normalize_keynames_fn a bit

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


- Log -----------------------------------------------------------------
commit 090fcb011485411d887b94c7c2a53e398766cfc9
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 28 15:59:36 2010 +0200

    s3-waf: add vfs_time_audit to the build.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Oct 28 15:14:27 UTC 2010 on sn-devel-104

commit e00671ee0c5ce1754bf041f2cd4abeacd1dedc61
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 27 16:31:05 2010 +0200

    s3-waf: use LZXPRESS subsystem.
    
    Guenther

commit 9dd467b2d578434c14e4a057fd27d36aafed8563
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 26 15:26:17 2010 +0200

    s3-selftest: add vfs_modulesdir variable for both test systems.
    
    Guenther

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

Summary of changes:
 selftest/target/Samba3.pm        |    3 ++-
 source3/modules/wscript_build    |    8 ++++++++
 source3/script/tests/selftest.sh |    3 ++-
 source3/wscript                  |    3 ++-
 source3/wscript_build            |    4 ++--
 5 files changed, 16 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index c03e188..4c554b5 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -356,6 +356,7 @@ sub provision($$$$$$)
 
 	my $prefix_abs = abs_path($prefix);
 	my $bindir_abs = abs_path($self->{bindir});
+	my $vfs_modulesdir_abs = $bindir_abs;
 
 	my @dirs = ();
 
@@ -530,7 +531,7 @@ sub provision($$$$$$)
 	map readonly = no
 	store dos attributes = yes
 	create mask = 755
-	vfs objects = $bindir_abs/xattr_tdb.so $bindir_abs/streams_depot.so
+	vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
 
 	printing = vlp
 	print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index d916ec9..8b6af85 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -48,6 +48,7 @@ VFS_DIRSORT_SRC = 'vfs_dirsort.c'
 VFS_SCANNEDONLY_SRC = 'vfs_scannedonly.c'
 VFS_CROSSRENAME_SRC = 'vfs_crossrename.c'
 VFS_LINUX_XFS_SGID_SRC = 'vfs_linux_xfs_sgid.c'
+VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c'
 
 
 bld.SAMBA_SUBSYSTEM('NFS4_ACLS',
@@ -392,6 +393,13 @@ bld.SAMBA_MODULE('vfs_linux_xfs_sgid',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_LINUX_XFS_SGID'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_LINUX_XFS_SGID'))
 
+bld.SAMBA_MODULE('vfs_time_audit',
+                 subsystem='vfs',
+                 source=VFS_TIME_AUDIT_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TIME_AUDIT'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TIME_AUDIT'))
+
 
 
 CHARSET_WEIRD_SRC = 'weird.c'
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index fba43e3..e68f208 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -87,6 +87,7 @@ SRCDIR="`dirname $0`/../.."
 BINDIR="`pwd`/bin"
 SCRIPTDIR=$SRCDIR/script/tests
 LIBDIR=$PREFIX_ABS/lib
+VFS_MODULESDIR=$BINDIR
 PIDDIR=$PREFIX_ABS/pid
 CONFFILE=$LIBDIR/client.conf
 SAMBA4CONFFILE=$LIBDIR/samba4client.conf
@@ -329,7 +330,7 @@ cat >$SERVERCONFFILE<<EOF
 	map readonly = no
 	store dos attributes = yes
 	create mask = 755
-	vfs objects = $BINDIR/xattr_tdb.so $BINDIR/streams_depot.so
+	vfs objects = $VFS_MODULESDIR/xattr_tdb.so $VFS_MODULESDIR/streams_depot.so
 
 	printing = vlp
 	print command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb print %p %s
diff --git a/source3/wscript b/source3/wscript
index 9657174..ea43c7e 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -333,7 +333,8 @@ return acl_get_perm_np(permset_d, perm);
                                       charset_CP437 auth_script vfs_readahead vfs_xattr_tdb
                                       vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb
                                       vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly
-                                      vfs_crossrename vfs_linux_xfs_sgid''')
+                                      vfs_crossrename vfs_linux_xfs_sgid
+                                      vfs_time_audit''')
 
     if Options.options.developer:
         default_static_modules.extend(TO_LIST('rpc_rpcecho pdb_ads'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 3e69366..2ae29b0 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -35,7 +35,7 @@ LIBNDR_DRSUAPI_SRC = '''../librpc/ndr/ndr_drsuapi.c
                      ../librpc/ndr/ndr_drsblobs.c
                      ../librpc/gen_ndr/ndr_drsblobs.c'''
 
-COMPRESSION_SRC = '../lib/compression/mszip.c ../lib/compression/lzxpress.c'
+COMPRESSION_SRC = '../lib/compression/mszip.c'
 
 DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
               ${COMPRESSION_SRC}'''
@@ -1039,7 +1039,7 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
 
 bld.SAMBA_SUBSYSTEM('LIBSMB',
                     source=LIBSMB_SRC,
-                    deps='LIBSAMBA ZLIB CLDAP',
+                    deps='LIBSAMBA ZLIB LZXPRESS CLDAP',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('CLDAP',


-- 
Samba Shared Repository