[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  103c1cb s3-waf: auth_netlogond depends on tldap.
       via  ad6d8a5 s3-waf: link SECRETS3 only against samba3util.
       via  9bafbf9 s3-waf: Create a smaller samba3util subsystem.
      from  0f14ac4 s4:pygensec/tests: add test for gensec_set_max_update_size()

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


- Log -----------------------------------------------------------------
commit 103c1cb9bf71af1925feb07386a6920807aceca3
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jan 12 14:50:40 2012 +0100

    s3-waf: auth_netlogond depends on tldap.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Thu Jan 12 17:33:10 CET 2012 on sn-devel-104

commit ad6d8a526e6bbcec1a9db25faf3f8849cd9e9dee
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jan 12 13:39:39 2012 +0100

    s3-waf: link SECRETS3 only against samba3util.

commit 9bafbf99947d24c8e9fad7e8927cfbe4060d6079
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jan 12 13:39:17 2012 +0100

    s3-waf: Create a smaller samba3util subsystem.

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

Summary of changes:
 source3/auth/wscript_build |    1 +
 source3/wscript_build      |   27 +++++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 4894e35..4f04772 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -96,6 +96,7 @@ bld.SAMBA3_MODULE('auth_builtin',
 bld.SAMBA3_MODULE('auth_netlogond',
                  subsystem='auth',
                  source=AUTH_NETLOGOND_SRC,
+                 deps='TLDAP',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_netlogond'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_netlogond'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 12e6fb9..4690561 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -48,20 +48,14 @@ LIB_SRC = '''
           lib/id_cache.c
           lib/talloc_dict.c
           lib/serverid.c
-          lib/util_transfer_file.c
           lib/addrchange.c
           ${TDB_LIB_SRC}
           ../lib/util/debug_s3.c
           lib/dumpcore.c
           lib/interface.c lib/pidfile.c
-          lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
           lib/username.c
           lib/access.c lib/smbrun.c
           lib/wins_srv.c
-          lib/util_sid.c
-          lib/util_file.c
-          lib/util.c
-          lib/util_sock.c lib/sock_exec.c
           lib/substitute.c lib/substitute_generic.c
           lib/ms_fnmatch.c
           lib/tallocmsg.c lib/dmallocmsg.c
@@ -77,6 +71,18 @@ LIB_SRC = '''
           libads/krb5_errs.c lib/system_smbd.c lib/audit.c
           lib/file_id.c lib/idmap_cache.c'''
 
+LIB_UTIL_SRC = '''
+               lib/system.c
+               lib/sendfile.c
+               lib/recvfile.c
+               lib/time.c
+               lib/util_sid.c
+               lib/util_file.c
+               lib/util.c
+               lib/util_sock.c
+               lib/util_transfer_file.c
+               lib/sock_exec.c'''
+
 POPT_LIB_SRC = '''lib/popt_common.c'''
 
 PARAM_UTIL_SRC = '''param/util.c'''
@@ -796,9 +802,14 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
                     public_deps='KRB5_WRAP k5crypto LIBTSOCKET CLDAP',
                     vars=locals())
 
+bld.SAMBA3_SUBSYSTEM('samba3util',
+                   source=LIB_UTIL_SRC,
+                   deps='ndr security NDR_SECURITY samba-util',
+                   vars=locals())
+
 bld.SAMBA3_SUBSYSTEM('samba3core',
                    source=LIB_SRC,
-                   deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules',
+                   deps='samba3util LIBTSOCKET LIBCRYPTO NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules',
                    vars=locals())
 
 bld.SAMBA3_LIBRARY('smbd_shim',
@@ -838,7 +849,7 @@ bld.SAMBA3_SUBSYSTEM('CLDAP',
 
 bld.SAMBA3_SUBSYSTEM('SECRETS3',
                    source=SECRETS_SRC,
-                   deps='NDR_SECRETS param samba3core pdb',
+                   deps='NDR_SECRETS param samba3util dbwrap pdb',
                    vars=locals())
 
 bld.SAMBA3_LIBRARY('smbldap',


-- 
Samba Shared Repository