lib: make asn1_util a private library
[samba.git] / source3 / wscript_build
old mode 100644 (file)
new mode 100755 (executable)
index 73cc20d..8685268
@@ -3,6 +3,16 @@
 from samba_utils import *
 import samba_version, samba3
 
+# enable building of public headers in the build tree
+bld.env.build_public_headers = 'include/public'
+
+# these are includes which appear in public headers, but with #ifdef conditional
+# compilation, so they are safe
+bld.env.public_headers_skip = ['lib/ldb_compat.h']
+
+# s3 public headers refer to non-public headers
+bld.env.public_headers_allow_broken = True
+
 TDB_LIB_SRC = '''
           lib/dbwrap.c lib/dbwrap_tdb.c
           lib/dbwrap_ctdb.c
@@ -47,40 +57,9 @@ LIBCLI_WINREG_SRC = '''rpc_client/cli_winreg.c
 # that requires knowledge of security contexts
 REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 
-LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
-
-LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
-
-UTIL_SRC = '''
-       ../lib/util/become_daemon.c
-       ../lib/util/blocking.c
-       ../lib/util/data_blob.c
-       ../lib/util/fsusage.c
-       ../lib/util/genrand.c
-       ../lib/util/params.c
-       ../lib/util/rbtree.c
-       ../lib/util/rfc1738.c
-       ../lib/util/select.c
-       ../lib/util/signal.c
-       ../lib/util/smb_threads.c
-       ../lib/util/system.c
-       ../lib/util/talloc_stack.c
-       ../lib/util/time.c
-       ../lib/util/util.c
-       ../lib/util/util_file.c
-       ../lib/util/util_id.c
-       ../lib/util/util_net.c
-       ../lib/util/util_strlist.c
-       ../lib/util/xfile.c
-       '''
-
-LIBTEVENT_SRC0 = ''
-
 PTHREADPOOL_SRC = ''
 
-LIBREPLACE_SRCS = ''
-
-LIB_SRC = '''${LIBSAMBAUTIL_SRC}
+LIB_SRC = '''
           lib/messages.c lib/messages_local.c
           lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
           lib/interfaces.c lib/memcache.c
@@ -90,15 +69,15 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           lib/util_transfer_file.c
           lib/addrchange.c
           ${TDB_LIB_SRC}
-          lib/debug.c lib/fault.c
+          ../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
-          ../libds/common/flag_mapping.c
           lib/access.c lib/smbrun.c
-          lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
+          lib/bitmap.c lib/dprintf.c
           lib/wins_srv.c
-          lib/clobber.c lib/util_sid.c
+          lib/util_sid.c
           lib/util_file.c
           lib/util.c lib/util_names.c
           lib/util_sock.c lib/sock_exec.c lib/util_sec.c
@@ -109,7 +88,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           intl/lang_tdb.c
           lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
           lib/sessionid_tdb.c
-          lib/module.c lib/events.c ${LIBTEVENT_SRC0}
+          lib/module.c lib/events.c
           lib/server_contexts.c
           lib/ldap_escape.c
           lib/secdesc.c ${PTHREADPOOL_SRC}
@@ -151,27 +130,15 @@ SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
                  passdb/machine_sid.c'''
 
 LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
-             libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
+             libsmb/namequery.c libsmb/conncache.c
              libads/dns.c libads/sitename_cache.c'''
 
-DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-
-LIBSMB_ERR_SRC = '''${DCE_RPC_ERR_SRC}'''
-
-LIBSMB_SRC0 = '''
+LIBNTLMSSP_SRC = '''
                libsmb/ntlmssp.c
-               libsmb/ntlmssp_wrap.c
-               ../libcli/auth/ntlmssp.c
-               ../libcli/auth/ntlmssp_sign.c
-               ../libcli/auth/ntlmssp_ndr.c
-               ../libcli/auth/ntlmssp_server.c'''
-
-LIBSAMBA_SRC = '${LIBSMB_SRC0}'
+               libsmb/ntlmssp_wrap.c'''
 
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
-SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
-
 LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clispnego.c
              libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
@@ -184,7 +151,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/smbsock_connect.c'''
 
 LIBMSRPC_SRC = '''
-               ${SCHANNEL_SRC}
                rpc_client/cli_pipe.c
                librpc/crypto/gse_krb5.c
                librpc/crypto/gse.c
@@ -193,15 +159,12 @@ LIBMSRPC_SRC = '''
                rpc_client/rpc_transport_np.c
                rpc_client/rpc_transport_sock.c
                rpc_client/rpc_transport_tstream.c
-               ../librpc/rpc/binding.c
-               ../librpc/rpc/dcerpc_util.c
                librpc/rpc/dcerpc_helpers.c
-               ../librpc/rpc/binding_handle.c'''
+               '''
 
 #
 # registry-related objects
 #
-UTIL_REG_SRC = '''../libcli/registry/util_reg.c'''
 
 REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
 REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
@@ -264,11 +227,12 @@ PRIVILEGES_SRC = '''lib/privileges.c'''
 PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 
 PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
-                passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
-                passdb/util_unixsids.c passdb/lookup_sid.c
+                lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c
+                lib/util_unixsids.c passdb/lookup_sid.c
                 passdb/login_cache.c
                 passdb/account_pol.c ${PRIVILEGES_SRC}
-                lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
+                lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}
+                passdb/pdb_util.c'''
 #FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
 
 GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
@@ -281,7 +245,7 @@ OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
 
 NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
 
-FNAME_UTIL_SRC = '''smbd/filename_util.c'''
+FNAME_UTIL_SRC = '''lib/filename_util.c'''
 
 
 PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
@@ -371,21 +335,14 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_pam_logoff.c
                    winbindd/winbindd_pam_chauthtok.c
                    winbindd/winbindd_pam_auth_crap.c
-                   winbindd/winbindd_pam_chng_pswd_auth_crap.c
-                   auth/auth_util.c
-                   auth/user_util.c
-                   auth/check_samsec.c
-                   auth/server_info.c
-                   auth/server_info_sam.c
-                   auth/user_info.c
-                   auth/user_util.c'''
+                   winbindd/winbindd_pam_chng_pswd_auth_crap.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
                   ${TDB_VALIDATE_SRC}'''
 
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
 
-SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.c'''
+SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.c smbd/msg_idmap.c'''
 
 BUILDOPT_SRC = '''smbd/build_options.c'''
 
@@ -401,7 +358,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/vfs.c smbd/perfcount.c smbd/statcache.c smbd/seal.c
                smbd/posix_acls.c lib/sysacls.c
                smbd/process.c smbd/service.c smbd/error.c
-               printing/printspoolss.c
+               printing/printspoolss.c printing/spoolssd.c
                lib/sysquotas.c lib/sysquotas_linux.c
                lib/sysquotas_xfs.c lib/sysquotas_4A.c
                lib/sysquotas_nfs.c
@@ -573,7 +530,8 @@ LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
 NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c
               utils/net_rpc_join.c utils/net_time.c utils/net_lookup.c
-              utils/net_cache.c utils/net_groupmap.c utils/net_idmap.c
+              utils/net_cache.c utils/net_groupmap.c
+              utils/net_idmap.c utils/net_idmap_check.c
               utils/net_status.c utils/net_rpc_printer.c utils/net_rpc_rights.c
               utils/net_rpc_service.c utils/net_rpc_registry.c utils/net_usershare.c
               utils/netlookup.c utils/net_sam.c utils/net_rpc_shell.c
@@ -605,6 +563,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 torture/test_async_echo.c
                 torture/test_addrchange.c
                 torture/test_posix_append.c
+               torture/test_case_insensitive.c
                 torture/test_smbsock_any_connect.c'''
 
 SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
@@ -679,6 +638,12 @@ t = bld.SAMBA_GENERATOR('build_env.h',
 t.env.SRCDIR = bld.path.abspath()
 t.env.BUILDDIR = bld.path.abspath()
 
+if not bld.env.toplevel_build:
+    bld.SAMBA_GENERATOR('smbtorture4',
+                       source='',
+                       target='',
+                       rule='cd ../; make -f Makefile-smbtorture4 bin/smbtorture4',
+                       always=True)
 
 bld.SETUP_BUILD_GROUPS()
 
@@ -696,7 +661,7 @@ if not bld.env.toplevel_build:
 bld.SAMBA3_LIBRARY('netapi',
                     source=LIBNETAPI_SRC,
                     public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
-                    passdb SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
+                    passdb SMBLDAP PARAM_WITHOUT_REG DYNCONFIG
                     LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI
                     RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL
                     LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
@@ -708,7 +673,7 @@ bld.SAMBA3_LIBRARY('netapi',
 
 bld.SAMBA3_LIBRARY('libsmb/smbclient',
                     source=LIBSMBCLIENT_SRC,
-                    public_deps='''talloc tdb wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP GROUPDB
+                    public_deps='''talloc tdb wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP
                     LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC''',
                     public_headers='include/libsmbclient.h',
                     vnum='0',
@@ -731,8 +696,8 @@ bld.SAMBA3_LIBRARY('nss_wins',
 bld.SAMBA3_SUBSYSTEM('msrpc3',
                     source='${LIBMSRPC_SRC}',
                     deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
-                    RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH
-                    LIBTSOCKET krb5''',
+                    RPC_NDR_EPMAPPER COMMON_SCHANNEL LIBCLI_AUTH
+                    LIBTSOCKET krb5 rpccommon''',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN',
@@ -755,11 +720,11 @@ bld.SAMBA3_SUBSYSTEM('GROUPDB',
 
 bld.SAMBA3_SUBSYSTEM('TLDAP',
                     source=TLDAP_SRC,
-                    deps='ASN1_UTIL LIBTSOCKET')
+                    deps='asn1util LIBTSOCKET')
 
 bld.SAMBA3_LIBRARY('passdb',
                    source=PASSDB_SRC,
-                   deps='GROUPDB SECRETS3 SMBLDAP pdb wbclient',
+                   deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH',
                    private_library=True,
                    vars=locals())
 
@@ -806,12 +771,12 @@ bld.SAMBA3_SUBSYSTEM('POPT_SAMBA3',
 
 bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
                     source=KRBCLIENT_SRC,
-                    deps='krb5 k5crypto com_err gssapi gssapi_krb5',
+                    public_deps='krb5 k5crypto com_err gssapi gssapi_krb5',
                     vars=locals())
 
 bld.SAMBA3_LIBRARY('samba3core',
                    source=LIB_SRC,
-                   deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET3 UTIL_TDB SAMBA_VERSION krb5',
+                   deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg',
                    private_library=True,
                    vars=locals())
 
@@ -821,18 +786,18 @@ bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
-                    source=LIBSMB_ERR_SRC,
-                    deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH',
+                    source='',
+                    deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon',
                     vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('LIBSAMBA',
-                    source=LIBSAMBA_SRC,
-                    deps='LIBSMB_ERR NDR_NTLMSSP ntlm_check',
+bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
+                    source=LIBNTLMSSP_SRC,
+                    deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBSMB',
                     source=LIBSMB_SRC,
-                    deps='LIBSAMBA CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT',
+                    deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
@@ -858,9 +823,10 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP',
 
 bld.SAMBA3_LIBRARY('ads',
                    source=LIBADS_SRC,
-                   deps='LIBCLI_LDAP_NDR krb5',
+                   deps='LIBCLI_LDAP_NDR krb5 gssapi gssapi_krb5 ldap lber',
                    private_library=True,
-                   vars=locals())
+                   vars=locals(),
+                   enabled=bld.env.HAVE_ADS)
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,
@@ -920,6 +886,7 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
 
 bld.SAMBA3_SUBSYSTEM('PRINTING',
                     source=PRINTING_SRC,
+                    deps='NDR_PRINTCAP',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
@@ -951,8 +918,9 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBNMB',
-                    source=LIBNMB_SRC,
-                    vars=locals())
+                     source=LIBNMB_SRC,
+                     deps='lmhosts',
+                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBNBT',
                     source='',
@@ -981,10 +949,6 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE',
                     source=SLCACHE_SRC,
                     vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('SPNEGO_PARSE',
-                    source='../libcli/auth/spnego_parse.c',
-                    vars=locals())
-
 bld.SAMBA3_SUBSYSTEM('DCUTIL',
                     source=DCUTIL_SRC,
                     vars=locals())
@@ -998,15 +962,10 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('CHARSET3',
-                    source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c''',
+                    source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c lib/fstring.c''',
                     public_deps='ICONV_WRAPPER CODEPOINTS',
                     deps='DYNCONFIG')
 
-bld.SAMBA3_SUBSYSTEM('samba-util3',
-                    source=UTIL_SRC,
-                    deps='talloc CHARSET3 LIBCRYPTO',
-                    vars=locals())
-
 bld.SAMBA3_SUBSYSTEM('ldb3',
                     source='lib/ldb_compat.c')
 
@@ -1050,7 +1009,7 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
 
 bld.SAMBA3_BINARY('smbd/smbd',
                  source='${SMBD_SRC_MAIN}',
-                 deps='smbd_base',
+                 deps='smbd_base EPMD',
                  install_path='${SBINDIR}',
                  vars=locals())
 
@@ -1073,7 +1032,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
                  RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
                  RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
-                 PAM_ERRORS WB_REQTRANS
+                 PAM_ERRORS WB_REQTRANS AUTH_COMMON
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
@@ -1131,13 +1090,13 @@ bld.SAMBA3_BINARY('profiles',
 bld.SAMBA3_BINARY('smbspool',
                  source=CUPS_SRC,
                  deps='''talloc tdb tevent resolv cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core
-                 KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+                 KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('testparm',
                  source=TESTPARM_SRC,
                  deps='''talloc tevent ldap cap 
-                 wbclient ASN1_UTIL LIBTSOCKET passdb param LIB_NONSMBD
+                 wbclient asn1util LIBTSOCKET passdb param LIB_NONSMBD
                  LIBSMB_ERR POPT_SAMBA3''',
                  vars=locals())
 
@@ -1161,21 +1120,21 @@ bld.SAMBA3_BINARY('smbcontrol',
 bld.SAMBA3_BINARY('smbtree',
                  source=SMBTREE_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD
-                 LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP GROUPDB LIBMSRPC_GEN msrpc3 PROFILE
+                 LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE
                  RPC_NDR_SRVSVC''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbpasswd',
                  source=SMBPASSWD_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD
-                 LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP GROUPDB LIBMSRPC_GEN msrpc3 PASSWD_UTIL
+                 LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL
                  LIBCLI_SAMR INIT_LSA PASSCHANGE''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('pdbedit',
                  source=PDBEDIT_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD
-                 LIBSAMBA LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP GROUPDB
+                 LIBNTLMSSP LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP
                  PASSWD_UTIL LIBCLI_LDAP_NDR''',
                  vars=locals())
 
@@ -1192,7 +1151,7 @@ bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
 bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  source=SMBTORTURE_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param LIBSMB KRBCLIENT TLDAP
-                 LIB_NONSMBD POPT_SAMBA3 ASN1_UTIL LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
+                 LIB_NONSMBD POPT_SAMBA3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbconftort',
@@ -1208,7 +1167,7 @@ bld.SAMBA3_BINARY('replacetort',
 bld.SAMBA3_BINARY('masktest' + bld.env.suffix3,
                  source=MASKTEST_SRC,
                  deps='''talloc tdb cap resolv wbclient param LIB_NONSMBD LIBSMB KRBCLIENT
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+                 asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('msgtest',
@@ -1219,14 +1178,14 @@ bld.SAMBA3_BINARY('msgtest',
 bld.SAMBA3_BINARY('smbcacls',
                  source=SMBCACLS_SRC,
                  deps='''talloc tdb cap resolv wbclient param LIBSMB KRBCLIENT
-                 LIB_NONSMBD passdb GROUPDB POPT_SAMBA3 SMBLDAP LIBMSRPC_GEN
+                 LIB_NONSMBD passdb POPT_SAMBA3 SMBLDAP LIBMSRPC_GEN
                  msrpc3 LIBCLI_LSA3''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbcquotas',
                  source=SMBCQUOTAS_SRC,
                  deps='''talloc tdb cap resolv wbclient param LIB_NONSMBD LIBSMB KRBCLIENT
-                 POPT_SAMBA3 passdb SMBLDAP GROUPDB LIBMSRPC_GEN msrpc3
+                 POPT_SAMBA3 passdb SMBLDAP LIBMSRPC_GEN msrpc3
                  LIBCLI_LSA3''',
                  vars=locals())
 
@@ -1244,12 +1203,12 @@ bld.SAMBA3_BINARY('sharesec',
 bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
                  source=LOCKTEST_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param KRBCLIENT LIBSMB LIB_NONSMBD
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+                 asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('pdbtest',
                  source=PDBTEST_SRC,
-                 deps='''talloc tdb cap resolv wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb GROUPDB
+                 deps='''talloc tdb cap resolv wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb
                  SMBLDAP POPT_SAMBA3 NDR_SAMR NDR_LSA''',
                  vars=locals())
 
@@ -1271,7 +1230,7 @@ bld.SAMBA3_BINARY('log2pcap',
 bld.SAMBA3_BINARY('locktest2',
                  source=LOCKTEST2_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param KRBCLIENT LIBSMB LIB_NONSMBD
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+                 asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('debug2html',
@@ -1281,7 +1240,7 @@ bld.SAMBA3_BINARY('debug2html',
 
 bld.SAMBA3_BINARY('smbfilter',
                  source=SMBFILTER_SRC,
-                 deps='''talloc tevent cap resolv wbclient param LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
+                 deps='''talloc tevent cap resolv wbclient param LIBSMB LIB_NONSMBD KRBCLIENT asn1util LIBTSOCKET
                  NDR_SAMR NDR_LSA''',
                  vars=locals())
 
@@ -1293,15 +1252,15 @@ bld.SAMBA3_BINARY('versiontest',
 bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
                  source=WBINFO_SRC,
                  deps='''talloc wbclient tevent cap
-                 ASN1_UTIL LIBTSOCKET passdb ldap param LIB_NONSMBD
-                 LIBSAMBA POPT_SAMBA3 LIBAFS_SETTOKEN''',
+                 asn1util LIBTSOCKET passdb ldap param LIB_NONSMBD
+                 LIBNTLMSSP POPT_SAMBA3 LIBAFS_SETTOKEN''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
                  source=NTLM_AUTH_SRC,
                  deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient param LIB_NONSMBD
-                 samba3core LIBSAMBA POPT_SAMBA3 ASN1_UTIL LIBTSOCKET
-                 passdb GROUPDB SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
+                 samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET
+                 passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
                  NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
                  vars=locals())
 
@@ -1312,12 +1271,12 @@ bld.SAMBA3_BINARY('timelimit',
 bld.SAMBA3_BINARY('rpc_open_tcp',
                  source=RPC_OPEN_TCP_SRC,
                  deps='''talloc tdb tevent resolv cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD
-                 LIBSMB_ERR ASN1_UTIL LIBTSOCKET LIBMSRPC_GEN msrpc3''',
+                 LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('test_lp_load',
                  source=TEST_LP_LOAD_SRC,
-                 deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBSAMBA''',
+                 deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBNTLMSSP''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('dbwrap_tool',
@@ -1334,7 +1293,7 @@ bld.SAMBA3_BINARY('dbwrap_torture',
 bld.SAMBA3_BINARY('split_tokens',
                  source=SPLIT_TOKENS_SRC,
                  deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3
-                 LIBSAMBA''',
+                 LIBNTLMSSP''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('vlp',
@@ -1354,10 +1313,11 @@ if not bld.env.toplevel_build:
     bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3')
     bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3')
     bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
-    bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='samba-util3')
+    bld.SAMBA3_SUBSYSTEM('samba-util', source='')
     bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3')
     bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
     bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
+    bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT')
 else:
 
     # dynconfig provides this in the toplevel build
@@ -1393,6 +1353,7 @@ bld.RECURSE('../libcli/security')
 bld.RECURSE('../libcli/smb')
 bld.RECURSE('../libcli/smbreadline')
 bld.RECURSE('../libcli/nbt')
+bld.RECURSE('../libcli/registry')
 bld.RECURSE('../lib/crypto')
 bld.RECURSE('../lib/iniparser/src')
 bld.RECURSE('../lib/nss_wrapper')
@@ -1407,6 +1368,7 @@ bld.RECURSE('../lib/util')
 bld.RECURSE('../lib/tevent')
 bld.RECURSE('../lib/tsocket')
 bld.RECURSE('../lib/zlib')
+bld.RECURSE('../libds/common')
 bld.RECURSE('../nsswitch')
 bld.RECURSE('../nsswitch/libwbclient')
 bld.RECURSE('auth')
@@ -1419,5 +1381,8 @@ bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
 bld.RECURSE('winbindd')
 
+
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()
+
+bld.SYMBOL_CHECK()