vfs: Remove smb_traffic_analyzer
[samba.git] / source3 / wscript_build
index 065b95bd75fc9a76ac1b6062200cb4e317a5bef3..4c6390e7d531fc8297d3c74a80e4957f663b793e 100755 (executable)
@@ -3,164 +3,6 @@
 from samba_utils import *
 import samba_version, samba3
 
-SMBTREE_SRC = '''utils/smbtree.c'''
-
-TESTPARM_SRC = 'utils/testparm.c'
-
-SMBTA_UTIL_SRC = '''utils/smbta-util.c'''
-
-TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
-
-PASSWD_UTIL_SRC = 'utils/passwd_util.c'
-
-SMBPASSWD_SRC = '''utils/smbpasswd.c'''
-
-PDBEDIT_SRC = '''utils/pdbedit.c'''
-
-SMBGET_SRC = '''utils/smbget.c'''
-
-RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
-                    rpcclient/cmd_samr.c rpcclient/cmd_spoolss.c
-                    rpcclient/cmd_netlogon.c rpcclient/cmd_srvsvc.c
-                    rpcclient/cmd_dfs.c rpcclient/cmd_epmapper.c
-                    rpcclient/cmd_dssetup.c rpcclient/cmd_echo.c
-                    rpcclient/cmd_shutdown.c rpcclient/cmd_test.c
-                    rpcclient/cmd_wkssvc.c rpcclient/cmd_ntsvcs.c
-                    rpcclient/cmd_drsuapi.c rpcclient/cmd_eventlog.c
-                    rpcclient/cmd_winreg.c rpcclient/cmd_fss.c'''
-
-RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
-
-LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
-                        libsmb/libsmb_thread_posix.c'''
-
-LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
-
-LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
-
-LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
-
-SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
-
-SMBCONFTORT_SRC = '''${SMBCONFTORT_SRC0}'''
-
-LIBNET_SRC = 'libnet/libnet_join.c'
-
-
-LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
-                       libnet/libnet_dssync_passdb.c
-                       libnet/libnet_dssync_keytab.c'''
-
-LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
-                        libnet/libnet_samsync_ldif.c
-                        libnet/libnet_samsync_passdb.c
-                        libnet/libnet_samsync_display.c
-                        libnet/libnet_samsync_keytab.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_time.c utils/net_lookup.c
-              utils/net_cache.c utils/net_groupmap.c
-              utils/net_idmap.c utils/net_idmap_check.c
-              utils/interact.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
-              utils/net_util.c utils/net_rpc_sh_acct.c utils/net_rpc_audit.c
-              utils/net_dns.c utils/net_ads_gpo.c
-              utils/net_conf.c utils/net_join.c utils/net_user.c
-              utils/net_group.c utils/net_file.c utils/net_registry.c
-              utils/net_registry_check.c
-              utils/net_dom.c utils/net_share.c
-              utils/net_g_lock.c
-              utils/net_serverid.c
-              utils/net_eventlog.c
-              utils/net_printing.c
-              utils/net_rpc_trust.c
-              utils/net_rpc_conf.c
-              registry/reg_parse.c registry/reg_format.c
-              registry/reg_import.c
-              '''
-
-NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
-
-NET_SRC = '''${NET_SRC1}
-             ${NET_SRC2}'''
-
-CUPS_SRC = '''client/smbspool.c'''
-
-NMBLOOKUP_SRC = '''utils/nmblookup.c'''
-
-SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
-                torture/denytest.c torture/mangle_test.c
-                torture/nbench.c
-                torture/test_async_echo.c
-                torture/test_addrchange.c
-                torture/test_posix_append.c
-                torture/test_nttrans_create.c
-                torture/test_nttrans_fsctl.c
-                torture/test_case_insensitive.c
-                torture/test_notify_online.c
-                torture/test_chain3.c
-                torture/test_smb2.c
-                torture/test_authinfo_structs.c
-                torture/test_smbsock_any_connect.c
-                torture/test_cleanup.c
-                torture/test_ctdbconn.c
-                torture/test_msg.c
-                torture/test_notify.c
-                lib/tevent_barrier.c
-                torture/test_dbwrap_watch.c
-                torture/test_idmap_tdb_common.c
-                torture/test_dbwrap_ctdb.c
-                torture/test_buffersize.c
-                torture/t_strappend.c'''
-
-SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
-        torture/wbc_async.c'''
-
-MSGTEST_SRC = '''torture/msgtest.c'''
-
-PDBTEST_SRC = '''torture/pdbtest.c'''
-
-VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c
-               torture/vfstest_chain.c'''
-
-LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
-
-LOCKTEST2_SRC = '''torture/locktest2.c'''
-
-SMBCACLS_SRC = '''utils/smbcacls.c'''
-
-SMBCQUOTAS_SRC = '''utils/smbcquotas.c'''
-
-EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
-
-EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}'''
-
-SHARESEC_SRC0 = 'utils/sharesec.c'
-SHARESEC_SRC  = '''${SHARESEC_SRC0}'''
-
-DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
-
-SMBFILTER_SRC = '''utils/smbfilter.c'''
-
-WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
-
-NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
-
-NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}'''
-
-VLP_SRC = '''printing/tests/vlp.c'''
-
-RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
-
-DBWRAP_TOOL_SRC = 'utils/dbwrap_tool.c'
-
-DBWRAP_TORTURE_SRC = 'utils/dbwrap_torture.c'
-
-SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
-
 LIBS='ICONV'
 
 config_h = "../include/config.h"
@@ -185,6 +27,7 @@ bld.SAMBA3_LIBRARY('netapi',
                     lib/netapi/libnetapi.c
                     lib/netapi/joindomain.c
                     lib/netapi/serverinfo.c
+                    lib/netapi/wkstainfo.c
                     lib/netapi/getdc.c
                     lib/netapi/user.c
                     lib/netapi/group.c
@@ -212,22 +55,6 @@ bld.SAMBA3_LIBRARY('netapi',
                     pc_files='libnet/netapi.pc',
                     vnum='0')
 
-bld.SAMBA3_LIBRARY('smbsharemodes',
-                    source=LIBSMBSHAREMODES_SRC,
-                    public_deps='''talloc tdb_compat''',
-                    deps='''ccan-hash''',
-                    public_headers='include/smb_share_modes.h',
-                    pc_files='libsmb/smbsharemodes.pc',
-                    vnum='0',
-                    vars=locals())
-
-bld.SAMBA3_LIBRARY('nss_wins',
-                  source=WINBIND_WINS_NSS_SRC,
-                  deps='''param libsmb LIBTSOCKET''',
-                  realname='libnss_wins.so.2',
-                  soname='libnss_wins.so',
-                  vnum='2')
-
 bld.SAMBA3_LIBRARY('gse',
                    source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
                    deps='krb5samba gensec param KRBCLIENT secrets3',
@@ -242,8 +69,8 @@ bld.SAMBA3_LIBRARY('msrpc3',
                    deps='''ndr ndr-standard
                     RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH
                     LIBTSOCKET gse dcerpc-binding
-                    libsmb
-                    ndr-table''',
+                    libsmb ndr-table NETLOGON_CREDS_CLI
+                   ''',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('gpo',
@@ -264,13 +91,13 @@ bld.SAMBA3_SUBSYSTEM('AVAHI',
 
 bld.SAMBA3_SUBSYSTEM('GROUPDB',
                     source='groupdb/mapping.c groupdb/mapping_tdb.c',
-                    deps='tdb_compat')
+                    deps='tdb')
 
 bld.SAMBA3_SUBSYSTEM('TLDAP',
                     source='''lib/tldap.c
                     lib/tldap_util.c
-                    lib/util_tsock.c''',
-                    deps='asn1util LIBTSOCKET')
+                    ''',
+                    deps='asn1util LIBTSOCKET samba3util')
 
 # libpdb.so should not expose internal symbols that are only usable
 # to the statically linked modules that are merged into libpdb.
@@ -278,31 +105,37 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
 # when modules are not linked statically. In the latter case
 # symbols will not be present in the libpdb anyway so no hurt is
 # done to the version script.
-static_pdb_match = ['tdbsam', 'smbpasswd', 'wbc_sam']
 private_pdb_match = []
-
-# AD DC module when linked statically will pull in few source4/winbind
-# dependencies which are not used outside AD DC module
-static_pdb_match.append('samba_dsdb')
 private_pdb_match.append('!idmap_init')
 private_pdb_match.append('!idmap_sids_to_xids')
 private_pdb_match.append('!idmap_xids_to_sids')
 
-# ldap module is actually three modules merged together: ldapsam, ipa, and nds
-static_pdb_match = static_pdb_match + ['ldap', 'ipa', 'nds']
 ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info',
                      '!ldapsam_*', '!groupmap_attr_list*', '!get_userattr_list',
                      '!dominfo_attr_list', '!get_attr_key2string',
                      '!sidmap_attr_list', '!attrib_map_*', '!idpool_attr_list',
                      '!get_attr_list']
 private_pdb_match.append('!pdb_nds_*')
-private_pdb_match.append('!pdb_init_ldapsam')
 private_pdb_match.append('!pdb_ldapsam_init*')
+private_pdb_match.append('!pdb_*_init')
 private_pdb_match = private_pdb_match + ldapsam_pdb_match
 
-private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match)
+bld.SAMBA3_LIBRARY('samba-passdb',
+                   source='',
+                   deps='pdb',
+                   private_library=False,
+                   grouping_library=True,
+                   pc_files=[],
+                   public_headers_install=True,
+                   public_headers='''
+                   include/passdb.h
+                   passdb/machine_sid.h
+                   passdb/lookup_sid.h''',
+                   abi_match=private_pdb_match,
+                   abi_directory='passdb/ABI',
+                   vnum='0.24.1')
 
-bld.SAMBA3_LIBRARY('pdb',
+bld.SAMBA3_SUBSYSTEM('pdb',
                    source='''passdb/pdb_get_set.c
                    passdb/passdb.c
                    lib/util_wellknown.c
@@ -320,17 +153,7 @@ bld.SAMBA3_LIBRARY('pdb',
                    passdb/pdb_interface.c
                    passdb/pdb_secrets.c
                    passdb/pdb_unixid.c''',
-                   deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping',
-                   private_library=False,
-                   pc_files=[],
-                   public_headers_install=True,
-                   public_headers='''
-                   include/passdb.h
-                   passdb/machine_sid.h
-                   passdb/lookup_sid.h''',
-                   abi_match=private_pdb_match,
-                   abi_directory='passdb/ABI',
-                   vnum='0')
+                   deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping samba-credentials')
 
 bld.SAMBA3_LIBRARY('smbldaphelper',
                    source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
@@ -343,36 +166,21 @@ bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
                      source='lib/server_mutex.c',
                      deps='talloc')
 
-bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
-                     source='param/util.c',
-                     deps='talloc')
-
-bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
-                     source='param/loadparm_ctx.c',
-                     deps='''talloc s3_param_h param''',
-                     vars=locals())
-
-bld.SAMBA_GENERATOR('param/param_global_h',
-                    source= '../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c',
-                    target='param/param_global.h',
-                    rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
-
 bld.SAMBA3_SUBSYSTEM('param',
                    source='''param/loadparm.c
                    lib/sharesec.c
                    lib/ldap_debug_handler.c
                    lib/util_names.c''',
-                   deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param/param_global_h cups''')
-
-bld.SAMBA3_PYTHON('pys3param',
-                  source='param/pyparam.c',
-                  deps='param',
-                  public_deps='samba-hostconfig pytalloc-util talloc',
-                  realname='samba/samba3/param.so')
-    
-bld.SAMBA3_SUBSYSTEM('param_service',
-                     source='param/service.c',
-                     deps = 'USER_UTIL param PRINTING')
+                   deps='''samba-util
+                   PARAM_UTIL
+                   ldap
+                   lber
+                   LOADPARM_CTX
+                   samba3core
+                   smbconf
+                   param_local.h
+                   param_global.h
+                   cups''')
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
@@ -447,30 +255,65 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
                    lib/util_sid.c
                    lib/util_file.c
                    lib/util.c
+                   lib/util_procid.c
                    lib/util_sock.c
+                   lib/util_tsock.c
                    lib/util_transfer_file.c
                    lib/sock_exec.c''',
-                   deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash')
+                   deps='ndr LIBTSOCKET samba-security NDR_SECURITY samba-util util_tdb sys_rw iov_buf')
 
+if bld.env.with_ctdb:
+    SAMBA_CLUSTER_SUPPORT_SOURCES='''
+                     lib/cluster_support.c
+                     lib/dbwrap/dbwrap_ctdb.c
+                     lib/messages_ctdbd.c
+                     lib/ctdbd_conn.c
+                   '''
+    SAMBA_CLUSTER_SUPPORT_DEPS='''
+                     talloc
+                     tevent
+                     tdb
+                   '''
+else:
+    SAMBA_CLUSTER_SUPPORT_SOURCES='''
+                     lib/cluster_support.c
+                     lib/ctdb_dummy.c
+                   '''
+    SAMBA_CLUSTER_SUPPORT_DEPS='''
+                     talloc
+                     tevent
+                   '''
+
+bld.SAMBA3_LIBRARY('samba-cluster-support',
+                   source=SAMBA_CLUSTER_SUPPORT_SOURCES,
+                   deps=SAMBA_CLUSTER_SUPPORT_DEPS,
+                   allow_undefined_symbols=True,
+                   private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('TDB_LIB',
                      source='''lib/dbwrap/dbwrap_open.c
-                     lib/dbwrap/dbwrap_ctdb.c
                      lib/dbwrap/dbwrap_watch.c
                      lib/g_lock.c''',
-                     deps='dbwrap')
+                     deps='dbwrap samba-cluster-support')
+
+bld.SAMBA3_LIBRARY('messages_dgm',
+                   source='''lib/messages_dgm.c lib/messages_dgm_ref.c''',
+                   deps='''talloc UNIX_MSG POLL_FUNCS_TEVENT samba-debug
+                           genrand''',
+                   private_library=True)
+
+bld.SAMBA3_LIBRARY('messages_util',
+                   source='''lib/messages_util.c''',
+                   deps='samba-util',
+                   private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('samba3core',
                    source='''lib/messages.c
-                   lib/messages_local.c
-                   lib/messages_ctdbd.c
-                   lib/ctdb_packet.c
-                   lib/ctdbd_conn.c
-                   lib/ctdb_conn.c
-                   lib/msg_channel.c
+                   lib/util_cluster.c
                    lib/id_cache.c
                    lib/talloc_dict.c
                    lib/serverid.c
+                   lib/server_id_db_util.c
                    lib/addrchange.c
                    ../lib/util/debug_s3.c
                    lib/dumpcore.c
@@ -496,7 +339,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/audit.c
                    lib/tevent_wait.c
                    lib/idmap_cache.c
-                   lib/util_ea.c''',
+                   lib/util_ea.c
+                   lib/background.c''',
                    deps='''
                         samba3util
                         LIBTSOCKET
@@ -505,11 +349,17 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         UTIL_PW
                         SAMBA_VERSION
                         PTHREADPOOL
+                        UNIX_MSG
+                        POLL_FUNCS_TEVENT
                         interfaces
                         param
                         dbwrap
                         samba3-util
                         errors3
+                        server_id_db
+                        messages_util
+                        messages_dgm
+                        talloc_report
                         TDB_LIB''')
 
 bld.SAMBA3_LIBRARY('smbd_shim',
@@ -524,8 +374,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
 
 bld.SAMBA3_SUBSYSTEM('auth_generic',
                     source='libsmb/auth_generic.c',
-                    deps='LIBNTLMSSP gse gensec',
-                    vars=locals())
+                    deps='LIBNTLMSSP gse gensec')
 
 bld.SAMBA3_LIBRARY('libsmb',
                    source='''libsmb/clientgen.c
@@ -548,8 +397,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                    libsmb/clioplock.c
                    libsmb/clirap2.c
                    libsmb/async_smb.c
-                   libsmb/smb2cli_tcon.c
-                   libsmb/cli_np_tstream.c
                    libsmb/reparse_symlink.c
                    libsmb/clisymlink.c
                    libsmb/smbsock_connect.c
@@ -562,6 +409,7 @@ bld.SAMBA3_LIBRARY('libsmb',
                    SPNEGO_PARSE
                    LIBTSOCKET
                    KRBCLIENT
+                   NDR_IOCTL
                    cli_smb_common
                    util_cmdline
                    tevent''',
@@ -569,8 +417,7 @@ bld.SAMBA3_LIBRARY('libsmb',
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
                     source='libads/cldap.c',
-                    deps='cli-ldap-common cli_cldap LIBTSOCKET',
-                    vars=locals())
+                    deps='cli-ldap-common cli_cldap LIBTSOCKET')
 
 # NOTE: The secrets3 library is a low level library used by several subsystems.
 # PLEASE DO NOT make it depend on high level libraries like PDB, if you are
@@ -619,16 +466,9 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
                     source='libads/ldap_printer.c',
                     deps='samba-util krb5samba')
 
-bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
-                    source='lib/afs_settoken.c',
-                    deps='samba-util')
-
-bld.SAMBA3_SUBSYSTEM('LIBAFS',
-                    source='lib/afs.c',
-                    deps='samba-util LIBAFS_SETTOKEN')
-
 bld.SAMBA3_LIBRARY('smbconf',
-                   source=LIB_SMBCONF_SRC,
+                   source='''lib/smbconf/smbconf_init.c
+                   lib/smbconf/smbconf_reg.c''',
                    deps='''
                    CHARSET3
                    LIBSMBCONF
@@ -652,6 +492,28 @@ bld.SAMBA3_LIBRARY('smbd_conn',
                    deps='samba3-util samba-util',
                    private_library=True)
 
+bld.SAMBA3_SUBSYSTEM('sysquotas',
+                     source='''
+                        lib/sysquotas.c
+                        lib/sysquotas_linux.c
+                        lib/sysquotas_xfs.c
+                        lib/sysquotas_4A.c
+                        lib/sysquotas_4B.c
+                        lib/sysquotas_nfs.c
+                     ''',
+                     allow_warnings=True,
+                     deps='samba3-util samba-util')
+
+NOTIFY_SOURCES=''
+NOTIFY_DEPS=''
+
+if bld.CONFIG_SET("HAVE_INOTIFY"):
+    NOTIFY_SOURCES += ' smbd/notify_inotify.c'
+
+if bld.CONFIG_SET('SAMBA_FAM_LIBS'):
+    NOTIFY_SOURCES += ' smbd/notify_fam.c'
+    NOTIFY_DEPS += ' ' + bld.CONFIG_GET('SAMBA_FAM_LIBS')
+
 bld.SAMBA3_LIBRARY('smbd_base',
                    source='''
                    smbd/server_reload.c
@@ -694,13 +556,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    smbd/error.c
                    printing/printspoolss.c
                    printing/spoolssd.c
-                   lib/sysquotas.c
-                   lib/sysquotas_linux.c
-                   lib/sysquotas_xfs.c
-                   lib/sysquotas_4A.c
-                   lib/sysquotas_4B.c
-                   lib/sysquotas_nfs.c
-                   lib/background.c
                    lib/sessionid_tdb.c
                    lib/conn_tdb.c
                    smbd/fake_file.c
@@ -729,7 +584,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    smbd/smb2_ioctl_named_pipe.c
                    smbd/smb2_ioctl_network_fs.c
                    smbd/smb2_keepalive.c
-                   smbd/smb2_find.c
+                   smbd/smb2_query_directory.c
                    smbd/smb2_notify.c
                    smbd/smb2_getinfo.c
                    smbd/smb2_setinfo.c
@@ -748,9 +603,8 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    smbd/oplock_irix.c
                    smbd/oplock_linux.c
                    smbd/notify.c
-                   smbd/notify_inotify.c
-                   smbd/notify_internal.c
-                   smbd/build_options.c''',
+                   smbd/notify_msg.c
+                   smbd/build_options.c''' + NOTIFY_SOURCES,
                    deps='''
                    talloc
                    tevent
@@ -760,6 +614,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    vfs
                    vfs_default
                    vfs_posixacl
+                  inotify
                    popt_samba3
                    samba3core
                    smbd_conn
@@ -770,14 +625,18 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    LOCKING
                    LIBADS_SERVER
                    LIBAFS
-                   RPC_SERVER
+                   RPC_SERVICE
                    NDR_SMBXSRV
+                   LEASES_DB
                    LIBASYS
-                   ccan-hash
+                   sysquotas
                    NDR_SMB_ACL
                    netapi
                    NDR_IOCTL
-                   ''' + bld.env['dmapi_lib'],
+                   notifyd
+                   ''' +
+                   bld.env['dmapi_lib'] +
+                   NOTIFY_DEPS,
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('LOCKING',
@@ -786,18 +645,28 @@ bld.SAMBA3_SUBSYSTEM('LOCKING',
                     locking/posix.c
                     locking/share_mode_lock.c''',
                     deps='''
-                    tdb_compat
+                    tdb
                     talloc
+                    LEASES_DB
                     NDR_OPEN_FILES
                     FNAME_UTIL''')
 
-bld.SAMBA3_SUBSYSTEM('PROFILE',
-                    source='profile/profile.c',
-                    deps='samba-util')
+bld.SAMBA3_SUBSYSTEM('LEASES_DB',
+                    source='locking/leases_db.c',
+                    deps='NDR_LEASES_DB')
+
+if bld.CONFIG_GET("WITH_PROFILE"):
+    bld.SAMBA3_SUBSYSTEM('PROFILE',
+                         source='profile/profile.c',
+                         deps='samba-util')
+else:
+    bld.SAMBA3_SUBSYSTEM('PROFILE',
+                         source='profile/profile_dummy.c',
+                         deps='')
 
 bld.SAMBA3_SUBSYSTEM('PRINTBASE',
                     source='''printing/notify.c printing/printing_db.c''',
-                    deps='samba-util tdb_compat')
+                    deps='samba-util tdb')
 
 bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
                     source='''printing/printing.c
@@ -806,12 +675,11 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
                     printing/nt_printing_migrate_internal.c
                     printing/nt_printing_ads.c
                     printing/queue_process.c''',
-                    deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate')
+                    deps='PRINTBASE LIBADS_PRINTER tdb printing_migrate')
 
 bld.SAMBA3_LIBRARY('printing_migrate',
                     source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
                     deps='NDR_NTPRINTING cli_spoolss RPC_NDR_WINREG LIBCLI_WINREG param',
-                    vars=locals(),
                     private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('PRINTING',
@@ -825,42 +693,43 @@ bld.SAMBA3_SUBSYSTEM('PRINTING',
                     printing/print_standard.c
                     printing/print_iprint.c
                     printing/printer_list.c''',
-                    deps='NDR_PRINTCAP tdb_compat cups')
+                    deps='NDR_PRINTCAP tdb cups')
 
 bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
-                    source=PASSWD_UTIL_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    source='utils/passwd_util.c',
+                    deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
                     source='lib/filename_util.c',
                     deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('LIBNET',
-                    source=LIBNET_SRC,
-                    deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb',
-                    vars=locals())
+                    source='libnet/libnet_join.c',
+                    deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb')
 
 bld.SAMBA3_LIBRARY('net_keytab',
                    source='libnet/libnet_keytab.c',
                    deps='krb5samba ads',
-                   vars=locals(),
                    private_library=True)
 
 
 bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
-                    source=LIBNET_DSSYNC_SRC,
-                    deps='LIBNET RPC_NDR_DRSUAPI',
-                    vars=locals())
+                    source='''libnet/libnet_dssync.c
+                    libnet/libnet_dssync_passdb.c
+                    libnet/libnet_dssync_keytab.c''',
+                    deps='LIBNET RPC_NDR_DRSUAPI')
 
 bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
-                    source=LIBNET_SAMSYNC_SRC,
-                    deps='LIBNET LIBCLI_SAMSYNC',
-                    vars=locals())
+                    source='''libnet/libnet_samsync.c
+                    libnet/libnet_samsync_ldif.c
+                    libnet/libnet_samsync_passdb.c
+                    libnet/libnet_samsync_display.c
+                    libnet/libnet_samsync_keytab.c''',
+                    deps='LIBNET LIBCLI_SAMSYNC')
 
 bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
                     source='lib/eventlog/eventlog.c',
-                    deps='NDR_EVENTLOG tdb_compat')
+                    deps='NDR_EVENTLOG tdb')
 
 bld.SAMBA3_SUBSYSTEM('LIBNMB',
                      source='''libsmb/unexpected.c
@@ -869,7 +738,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB',
                      libsmb/namequery.c
                      libsmb/conncache.c
                      libads/sitename_cache.c''',
-                     deps='addns lmhosts resolv')
+                     deps='LIBTSOCKET samba3util addns lmhosts resolv')
 
 bld.SAMBA3_SUBSYSTEM('SERVICES',
                     source='''services/svc_spoolss.c
@@ -897,7 +766,7 @@ bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
 
 bld.SAMBA3_SUBSYSTEM('SLCACHE',
                     source='libsmb/samlogon_cache.c',
-                    deps='samba-util tdb_compat')
+                    deps='samba-util tdb')
 
 bld.SAMBA3_SUBSYSTEM('DCUTIL',
                     source='''libsmb/namequery_dc.c
@@ -907,17 +776,20 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL',
 
 bld.SAMBA3_LIBRARY('trusts_util',
                    source='libsmb/trusts_util.c',
-                   deps='libcli_netlogon3 msrpc3 pdb',
-                   vars=locals(),
+                   deps='libcli_netlogon3 msrpc3 samba-passdb',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     source='lib/util_tdb.c',
-                    deps='talloc samba3-util',
-                    vars=locals())
+                    deps='talloc samba3-util')
+
+bld.SAMBA3_LIBRARY('msghdr',
+                   source='lib/msghdr.c',
+                   deps='replace iov_buf',
+                   private_library=True)
 
 bld.SAMBA3_LIBRARY('samba3-util',
-                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/namearray.c lib/file_id.c''',
+                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/namearray.c lib/file_id.c''',
                    deps='samba-util charset',
                    private_library=True)
 
@@ -947,7 +819,7 @@ bld.SAMBA3_LIBRARY('libcli_lsa3',
 
 bld.SAMBA3_LIBRARY('libcli_netlogon3',
                    source='rpc_client/cli_netlogon.c rpc_client/util_netlogon.c',
-                   deps='RPC_NDR_NETLOGON INIT_NETLOGON cliauth param',
+                   deps='msrpc3 RPC_NDR_NETLOGON INIT_NETLOGON cliauth param NETLOGON_CREDS_CLI',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('cli_spoolss',
@@ -962,7 +834,7 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG_INTERNAL',
                     source='rpc_client/cli_winreg_int.c',
-                    deps='LIBCLI_WINREG RPC_NCACN_NP')
+                    deps='LIBCLI_WINREG RPC_SERVER')
 
 bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
                     source='rpc_client/cli_pipe_schannel.c',
@@ -980,11 +852,14 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
                     source='rpc_client/init_samr.c',
                     deps='samba-util')
 
+bld.SAMBA3_SUBSYSTEM('LIBLSA',
+                     source='lib/lsa.c')
+
 ########################## BINARIES #################################
 
 bld.SAMBA3_BINARY('smbd/smbd',
                  source='smbd/server.c',
-                 deps='smbd_base EPMD LSASD',
+                 deps='smbd_base EPMD LSASD FSSD MDSSD',
                  install_path='${SBINDIR}')
 
 bld.SAMBA3_BINARY('nmbd/nmbd',
@@ -1006,7 +881,7 @@ bld.SAMBA3_BINARY('nmbd/nmbd',
                  param
                  libsmb
                  popt_samba3
-                 PROFILE''',
+                 ''',
                  install_path='${SBINDIR}')
 
 
@@ -1058,6 +933,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  winbindd/wb_group_members.c
                  winbindd/wb_getgrsid.c
                  winbindd/wb_query_user_list.c
+                 winbindd/wb_query_group_list.c
                  winbindd/wb_fill_pwent.c
                  winbindd/wb_next_pwent.c
                  winbindd/wb_next_grent.c
@@ -1095,6 +971,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  winbindd/winbindd_list_groups.c
                  winbindd/winbindd_check_machine_acct.c
                  winbindd/winbindd_change_machine_acct.c
+                 winbindd/winbindd_irpc.c
                  winbindd/winbindd_ping_dc.c
                  winbindd/winbindd_pam_auth.c
                  winbindd/winbindd_pam_logoff.c
@@ -1115,20 +992,40 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  LIBCLI_SAMR
                  SLCACHE
                  RPC_NDR_DSSETUP
-                 RPC_NDR_WBINT
-                 SRV_NDR_WBINT
+                 RPC_NDR_WINBIND
+                 SRV_NDR_WINBIND
                  RPC_SAMR
                  RPC_LSARPC
-                 RPC_NCACN_NP
-                 RPC_PIPE_REGISTER
+                 RPC_SERVER
                  WB_REQTRANS
                  TDB_VALIDATE
+                 MESSAGING
+                 LIBLSA
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}')
 
 bld.SAMBA3_BINARY('rpcclient/rpcclient',
-                 source=RPCCLIENT_SRC,
+                 source='''rpcclient/rpcclient.c
+                 rpcclient/cmd_lsarpc.c
+                 rpcclient/cmd_samr.c
+                 rpcclient/cmd_spoolss.c
+                 rpcclient/cmd_netlogon.c
+                 rpcclient/cmd_srvsvc.c
+                 rpcclient/cmd_dfs.c
+                 rpcclient/cmd_epmapper.c
+                 rpcclient/cmd_dssetup.c
+                 rpcclient/cmd_echo.c
+                 rpcclient/cmd_shutdown.c
+                 rpcclient/cmd_test.c
+                 rpcclient/cmd_wkssvc.c
+                 rpcclient/cmd_ntsvcs.c
+                 rpcclient/cmd_drsuapi.c
+                 rpcclient/cmd_eventlog.c
+                 rpcclient/cmd_winreg.c
+                 rpcclient/cmd_fss.c
+                 rpcclient/cmd_witness.c
+                 rpcclient/cmd_clusapi.c''',
                  deps='''
                  talloc
                  popt_samba3
@@ -1155,9 +1052,10 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  RPC_NDR_NTSVCS
                  RPC_NDR_EVENTLOG
                  INIT_SAMR
-                RPC_NDR_FSRVP
-                 ''',
-                 vars=locals())
+                 RPC_NDR_FSRVP
+                 RPC_NDR_WITNESS
+                 RPC_NDR_CLUSAPI
+                 ''')
 
 bld.SAMBA3_BINARY('client/smbclient',
                  source='''client/client.c
@@ -1172,10 +1070,60 @@ bld.SAMBA3_BINARY('client/smbclient',
                  libsmb
                  msrpc3
                  RPC_NDR_SRVSVC
-                 cli_smb_common''')
+                 cli_smb_common
+                 ''' + bld.env['archive_lib'])
 
 bld.SAMBA3_BINARY('net',
-                 source=NET_SRC,
+                 source='''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_time.c
+                 utils/net_lookup.c
+                 utils/net_cache.c
+                 utils/net_groupmap.c
+                 utils/net_idmap.c
+                 utils/net_idmap_check.c
+                 utils/interact.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
+                 utils/net_util.c
+                 utils/net_rpc_sh_acct.c
+                 utils/net_rpc_audit.c
+                 utils/net_dns.c
+                 utils/net_ads_gpo.c
+                 utils/net_conf.c
+                 utils/net_conf_util.c
+                 utils/net_join.c
+                 utils/net_user.c
+                 utils/net_group.c
+                 utils/net_file.c
+                 utils/net_registry.c
+                 utils/net_registry_check.c
+                 utils/net_dom.c
+                 utils/net_share.c
+                 utils/net_g_lock.c
+                 utils/net_serverid.c
+                 utils/net_eventlog.c
+                 utils/net_printing.c
+                 utils/net_rpc_trust.c
+                 utils/net_rpc_conf.c
+                 utils/net_afs.c
+                 utils/net_notify.c
+                 registry/reg_parse.c
+                 registry/reg_format.c
+                 registry/reg_import.c
+                 utils/net_registry_util.c
+                 utils/net_help_common.c''',
                  deps='''
                  talloc
                  netapi
@@ -1212,8 +1160,8 @@ bld.SAMBA3_BINARY('net',
                  RPC_NDR_DSSETUP
                  RPC_NDR_INITSHUTDOWN
                  printing_migrate
-                 trusts_util''',
-                 vars=locals())
+                 trusts_util
+                 IDMAP_AUTORID_TDB''')
 
 bld.SAMBA3_BINARY('profiles',
                  source='utils/profiles.c',
@@ -1224,35 +1172,30 @@ bld.SAMBA3_BINARY('profiles',
                  REGFIO''')
 
 bld.SAMBA3_BINARY('smbspool',
-                 source=CUPS_SRC,
+                 source='client/smbspool.c',
                  deps='''
                  talloc
                  popt_samba3
                  param
                  libsmb
-                 samba3core''',
-                 vars=locals())
+                 samba3core''')
 
 bld.SAMBA3_BINARY('testparm',
-                 source=TESTPARM_SRC,
+                 source='utils/testparm.c',
                  deps='''
                  talloc
                  param
-                 popt_samba3''',
-                 vars=locals())
+                 popt_samba3''')
 
-bld.SAMBA3_BINARY('smbta-util',
-                 source=SMBTA_UTIL_SRC,
-                 deps='''
-                 talloc
-                 secrets3
-                 param''',
-                 vars=locals())
+smbstatus_source = 'utils/status.c smbd/notify_msg.c'
+
+if bld.CONFIG_GET("WITH_PROFILE"):
+    smbstatus_source += ' utils/status_profile.c'
+else:
+    smbstatus_source += ' utils/status_profile_dummy.c'
 
 bld.SAMBA3_BINARY('smbstatus',
-                 source='''utils/status.c
-                 utils/status_profile.c
-                 smbd/notify_internal.c''',
+                 source=smbstatus_source,
                  deps='''
                  talloc
                  param
@@ -1270,56 +1213,80 @@ bld.SAMBA3_BINARY('smbcontrol',
                  PRINTBASE''')
 
 bld.SAMBA3_BINARY('smbtree',
-                 source=SMBTREE_SRC,
+                 source='utils/smbtree.c',
                  deps='''
                  talloc
                  param
                  libsmb
                  msrpc3
                  popt_samba3
-                 PROFILE
-                 RPC_NDR_SRVSVC''',
-                 vars=locals())
+                 RPC_NDR_SRVSVC''')
 
 bld.SAMBA3_BINARY('smbpasswd',
-                 source=SMBPASSWD_SRC,
+                 source='utils/smbpasswd.c',
                  deps='''
                  talloc
                  param
                  pdb
                  PASSWD_UTIL
-                 PASSCHANGE''',
-                 vars=locals())
+                 PASSCHANGE''')
 
 bld.SAMBA3_BINARY('pdbedit',
-                 source=PDBEDIT_SRC,
+                 source='utils/pdbedit.c',
                  deps='''
                  talloc
                  param
                  popt_samba3
                  pdb
-                 PASSWD_UTIL''',
-                 vars=locals())
+                 PASSWD_UTIL''')
 
 bld.SAMBA3_BINARY('smbget',
-                 source=SMBGET_SRC,
+                 source='utils/smbget.c',
                  deps='''
                  talloc
                  popt_samba3
-                 smbclient''',
-                 vars=locals())
+                 smbclient''')
 
 bld.SAMBA3_BINARY('nmblookup',
-                 source=NMBLOOKUP_SRC,
+                 source='utils/nmblookup.c',
                  deps='''
                  talloc
                  param
                  popt_samba3
-                 LIBNMB''',
-                 vars=locals())
+                 LIBNMB''')
 
 bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
-                 source=SMBTORTURE_SRC,
+                 source='''torture/torture.c
+                 torture/nbio.c
+                 torture/scanner.c
+                 torture/utable.c
+                 torture/denytest.c
+                 torture/mangle_test.c
+                 torture/nbench.c
+                 torture/test_async_echo.c
+                 torture/test_addrchange.c
+                 torture/test_posix_append.c
+                 torture/test_nttrans_create.c
+                 torture/test_nttrans_fsctl.c
+                 torture/test_case_insensitive.c
+                 torture/test_notify_online.c
+                 torture/test_chain3.c
+                 torture/test_smb2.c
+                 torture/test_authinfo_structs.c
+                 torture/test_smbsock_any_connect.c
+                 torture/test_cleanup.c
+                 torture/test_notify.c
+                 lib/tevent_barrier.c
+                 torture/test_dbwrap_watch.c
+                 torture/test_idmap_tdb_common.c
+                 torture/test_dbwrap_ctdb.c
+                 torture/test_buffersize.c
+                 torture/test_messaging_read.c
+                 torture/test_messaging_fd_passing.c
+                 torture/test_oplock_cancel.c
+                 torture/t_strappend.c
+                 torture/bench_pthreadpool.c
+                 torture/wbc_async.c''',
                  deps='''
                  talloc
                  param
@@ -1329,20 +1296,21 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  RPC_NDR_ECHO
                  WB_REQTRANS
                  LOCKING
-                NDR_OPEN_FILES
-                idmap
+                 NDR_OPEN_FILES
+                 idmap
+                 IDMAP_TDB_COMMON
+                 samba-cluster-support
                  ''',
-                 install=False,
-                 vars=locals())
+                 cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+                 install=False)
 
 bld.SAMBA3_BINARY('smbconftort',
-                 source=SMBCONFTORT_SRC,
+                 source='lib/smbconf/testsuite.c',
                  deps='''
                  talloc
                  param
                  popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('replacetort',
                  source='../lib/replace/test/main.c',
@@ -1350,170 +1318,160 @@ bld.SAMBA3_BINARY('replacetort',
                  install=False)
 
 bld.SAMBA3_BINARY('msgtest',
-                 source=MSGTEST_SRC,
+                 source='torture/msgtest.c',
                  deps='''
                  talloc
                  param''',
-                 install=False,
-                 vars=locals())
+                 install=False)
+
+bld.SAMBA3_BINARY('msg_sink',
+                 source='torture/msg_sink.c',
+                 deps='''
+                 talloc
+                 param''',
+                 install=False)
+
+bld.SAMBA3_BINARY('msg_source',
+                 source='torture/msg_source.c',
+                 deps='''
+                 talloc
+                 param''',
+                 install=False)
 
 bld.SAMBA3_BINARY('smbcacls',
-                 source=SMBCACLS_SRC,
+                 source='utils/smbcacls.c lib/util_sd.c',
                  deps='''
                  talloc
                  popt_samba3
                  msrpc3
                  libcli_lsa3
-                 krb5samba''',
-                 vars=locals())
+                 krb5samba''')
 
 bld.SAMBA3_BINARY('smbcquotas',
-                 source=SMBCQUOTAS_SRC,
+                 source='utils/smbcquotas.c',
                  deps='''
                  talloc
                  popt_samba3
                  libsmb
                  msrpc3
-                 libcli_lsa3''',
-                 vars=locals())
+                 libcli_lsa3''')
 
 bld.SAMBA3_BINARY('eventlogadm',
-                 source=EVTLOGADM_SRC,
+                 source='utils/eventlogadm.c',
                  deps='''
                  talloc
                  param
-                 LIBEVENTLOG''',
-                 vars=locals())
+                 LIBEVENTLOG''')
 
 bld.SAMBA3_BINARY('sharesec',
-                 source=SHARESEC_SRC,
+                 source='utils/sharesec.c lib/util_sd.c',
                  deps='''
                  talloc
-                 popt_samba3''',
-                 vars=locals())
+                 msrpc3
+                 libcli_lsa3
+                 popt_samba3''')
 
 bld.SAMBA3_BINARY('pdbtest',
-                 source=PDBTEST_SRC,
+                 source='torture/pdbtest.c',
                  deps='''
                  talloc
                  pdb
                  popt_samba3
                  AUTH_COMMON
                  auth''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('vfstest',
-                 source=VFSTEST_SRC,
+                 source='''torture/cmd_vfs.c
+                 torture/vfstest.c
+                 torture/vfstest_chain.c''',
                  deps='''
                  vfs
                  popt_samba3
                  SMBREADLINE''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('log2pcap',
-                 source=LOG2PCAP_SRC,
+                 source='utils/log2pcaphex.c',
                  deps='''talloc popt''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('locktest2',
-                 source=LOCKTEST2_SRC,
+                 source='torture/locktest2.c',
                  deps='''
                  talloc
                  param
                  libsmb
                  LOCKING''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('debug2html',
-                 source=DEBUG2HTML_SRC,
+                 source='''utils/debug2html.c utils/debugparse.c''',
                  deps='''talloc popt''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('smbfilter',
-                 source=SMBFILTER_SRC,
+                 source='utils/smbfilter.c',
                  deps='''
                  talloc
                  param
                  LIBNMB''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('versiontest',
                  source='lib/version_test.c',
                  deps='''
                  SAMBA_VERSION
                  param''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('ntlm_auth',
-                 source=NTLM_AUTH_SRC,
+                 source='''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c''',
                  deps='''
                  talloc
                  krb5samba
-                 iniparser
+                 tiniparser
                  libsmb
                  popt_samba3
-                 LIBNTLMSSP gse gensec''',
-                 vars=locals())
+                 LIBNTLMSSP gse gensec''')
 
 bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('rpc_open_tcp',
-                 source=RPC_OPEN_TCP_SRC,
+                 source='torture/rpc_open_tcp.c',
                  deps='''
                  talloc
                  msrpc3''',
-                 install=False,
-                 vars=locals())
-
-bld.SAMBA3_BINARY('test_lp_load',
-                 source=TEST_LP_LOAD_SRC,
-                 deps='''
-                 talloc
-                 param
-                 popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('dbwrap_tool',
-                 source=DBWRAP_TOOL_SRC,
+                 source='utils/dbwrap_tool.c',
                  deps='''
                  talloc
-                 popt_samba3''',
-                 vars=locals())
+                 popt_samba3''')
 
 bld.SAMBA3_BINARY('dbwrap_torture',
-                 source=DBWRAP_TORTURE_SRC,
+                 source='utils/dbwrap_torture.c',
                  deps='''
                  talloc
                  popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('split_tokens',
-                 source=SPLIT_TOKENS_SRC,
+                 source='utils/split_tokens.c',
                  deps='''
                  talloc
                  popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('vlp',
-                 source=VLP_SRC,
+                 source='printing/tests/vlp.c',
                  deps='''
                  talloc
                  param''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_PYTHON('pysmbd',
                   source='smbd/pysmbd.c',
@@ -1531,10 +1489,19 @@ bld.SAMBA3_BINARY('samba-regedit',
                   source="""utils/regedit.c utils/regedit_samba3.c
                             utils/regedit_wrap.c utils/regedit_treeview.c
                             utils/regedit_valuelist.c utils/regedit_dialog.c
-                            utils/regedit_hexedit.c""",
+                            utils/regedit_hexedit.c utils/regedit_list.c""",
                   deps='ncurses menu panel form registry param popt_samba3 smbregistry',
-                  enabled=bld.env.build_regedit,
-                  vars=locals())
+                  enabled=bld.env.build_regedit)
+
+bld.SAMBA3_BINARY('spotlight2sparql',
+                 source='''
+                 rpc_server/mdssvc/sparql_parser_test.c
+                 rpc_server/mdssvc/sparql_parser.c
+                 rpc_server/mdssvc/sparql_lexer.c
+                 rpc_server/mdssvc/sparql_mapping.c''',
+                 deps='samba3-util talloc ' + bld.env['libtracker'],
+                 enabled=bld.env.with_spotlight,
+                 install=False)
 
 ########################## INCLUDES #################################
 
@@ -1542,11 +1509,13 @@ bld.RECURSE('auth')
 bld.RECURSE('libgpo/gpext')
 bld.RECURSE('lib/pthreadpool')
 bld.RECURSE('lib/asys')
+bld.RECURSE('lib/poll_funcs')
+bld.RECURSE('lib/unix_msg')
 bld.RECURSE('librpc')
 bld.RECURSE('librpc/idl')
 bld.RECURSE('libsmb')
 bld.RECURSE('modules')
-bld.RECURSE('pam_smbpass')
+bld.RECURSE('param')
 bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
 bld.RECURSE('script')
@@ -1557,6 +1526,7 @@ bld.RECURSE('../examples/pdb')
 bld.RECURSE('../examples/VFS')
 bld.RECURSE('lib/netapi/tests')
 bld.RECURSE('lib/netapi/examples')
+bld.RECURSE('smbd/notifyd')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()