build: list sources of subsystem LIBCLI_SAMR directly in the definition
[nivanova/samba-autobuild/.git] / source3 / wscript_build
index 66171bfe6c37c43db2a81706195d48624a034ac4..39d5764da80134f50b4a6e3b389d2a8740b59df6 100755 (executable)
@@ -3,73 +3,12 @@
 from samba_utils import *
 import samba_version, samba3
 
-TDB_LIB_SRC = '''
-         lib/dbwrap/dbwrap_open.c
-          lib/dbwrap/dbwrap_ctdb.c
-          lib/dbwrap/dbwrap_watch.c
-          lib/g_lock.c'''
-
-TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-
-SMBLDAP_SRC = '''lib/smbldap.c'''
-
-VERSION_SRC = '''lib/version.c'''
-
-AFS_SRC = 'lib/afs.c'
-
-AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
-
-AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
-
-SERVER_MUTEX_SRC = 'lib/server_mutex.c'
-
-PASSCHANGE_SRC = '''libsmb/passchange.c'''
-
-LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
-                     rpc_client/init_spoolss.c'''
-
-LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
-
-LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
-
 LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
 REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 
-LIB_SRC = '''
-          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/id_cache.c
-          lib/talloc_dict.c
-          lib/serverid.c
-          lib/addrchange.c
-          ${TDB_LIB_SRC}
-          ../lib/util/debug_s3.c
-          lib/dumpcore.c
-          lib/interface.c
-          lib/username.c
-          lib/access.c lib/smbrun.c
-          lib/wins_srv.c
-          lib/substitute.c lib/substitute_generic.c
-          lib/ms_fnmatch.c
-          lib/tallocmsg.c lib/dmallocmsg.c
-          intl/lang_tdb.c
-          lib/conn_tdb.c lib/gencache.c
-          lib/sessionid_tdb.c
-          lib/events.c
-          lib/server_contexts.c
-          lib/server_prefork.c
-          lib/server_prefork_util.c
-          lib/ldap_escape.c
-          lib/fncall.c
-          libads/krb5_errs.c lib/system_smbd.c lib/audit.c
-         lib/tevent_wait.c
-          lib/idmap_cache.c'''
-
 LIB_UTIL_SRC = '''
                lib/system.c
                lib/sendfile.c
@@ -135,11 +74,11 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/cli_np_tstream.c
              libsmb/reparse_symlink.c
              libsmb/clisymlink.c
-             libsmb/smbsock_connect.c'''
+             libsmb/smbsock_connect.c
+             libsmb/cli_smb2_fnum.c'''
 
 LIBMSRPC_SRC = '''
                rpc_client/cli_pipe.c
-               librpc/rpc/rpc_common.c
                rpc_client/rpc_transport_np.c
                rpc_client/rpc_transport_sock.c
                rpc_client/rpc_transport_tstream.c
@@ -210,12 +149,12 @@ PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 
 PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
                 lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c
+                lib/util_sid_passdb.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
                 passdb/pdb_util.c passdb/pdb_interface.c
-                passdb/pdb_ldap_schema.c
                 passdb/pdb_secrets.c
                 passdb/pdb_unixid.c'''
 #FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
@@ -238,96 +177,6 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
 
 DCUTIL_SRC  = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
 
-WINBINDD_SRC1 = '''winbindd/winbindd.c
-                   winbindd/winbindd_group.c
-                   winbindd/winbindd_util.c
-                   winbindd/winbindd_cache.c
-                   winbindd/winbindd_pam.c
-                   winbindd/winbindd_misc.c
-                   winbindd/winbindd_cm.c
-                   winbindd/winbindd_wins_byip.c
-                   winbindd/winbindd_wins_byname.c
-                   winbindd/winbindd_msrpc.c
-                   winbindd/winbindd_rpc.c
-                   winbindd/winbindd_reconnect.c
-                   winbindd/winbindd_ads.c
-                   winbindd/winbindd_samr.c
-                   winbindd/winbindd_dual.c
-                   winbindd/winbindd_dual_ndr.c
-                   winbindd/winbindd_dual_srv.c
-                   winbindd/winbindd_async.c
-                   winbindd/winbindd_creds.c
-                   winbindd/winbindd_cred_cache.c
-                   winbindd/winbindd_ccache_access.c
-                   winbindd/winbindd_domain.c
-                   winbindd/winbindd_idmap.c
-                   winbindd/winbindd_locator.c
-                   winbindd/winbindd_ndr.c
-                   winbindd/wb_ping.c
-                   winbindd/wb_lookupsid.c
-                   winbindd/wb_lookupsids.c
-                   winbindd/wb_lookupname.c
-                   winbindd/wb_sid2uid.c
-                   winbindd/wb_sid2gid.c
-                   winbindd/wb_uid2sid.c
-                   winbindd/wb_gid2sid.c
-                   winbindd/wb_queryuser.c
-                   winbindd/wb_lookupuseraliases.c
-                   winbindd/wb_lookupusergroups.c
-                   winbindd/wb_getpwsid.c
-                   winbindd/wb_gettoken.c
-                   winbindd/wb_seqnum.c
-                   winbindd/wb_seqnums.c
-                   winbindd/wb_group_members.c
-                   winbindd/wb_getgrsid.c
-                   winbindd/wb_query_user_list.c
-                   winbindd/wb_fill_pwent.c
-                   winbindd/wb_next_pwent.c
-                   winbindd/wb_next_grent.c
-                   winbindd/wb_dsgetdcname.c
-                   winbindd/winbindd_lookupsid.c
-                   winbindd/winbindd_lookupsids.c
-                   winbindd/winbindd_lookupname.c
-                   winbindd/winbindd_sid_to_uid.c
-                   winbindd/winbindd_sid_to_gid.c
-                   winbindd/winbindd_uid_to_sid.c
-                   winbindd/winbindd_gid_to_sid.c
-                   winbindd/winbindd_sids_to_xids.c
-                   winbindd/winbindd_allocate_uid.c
-                   winbindd/winbindd_allocate_gid.c
-                   winbindd/winbindd_getpwsid.c
-                   winbindd/winbindd_getpwnam.c
-                   winbindd/winbindd_getpwuid.c
-                   winbindd/winbindd_getsidaliases.c
-                   winbindd/winbindd_getuserdomgroups.c
-                   winbindd/winbindd_getgroups.c
-                   winbindd/winbindd_show_sequence.c
-                   winbindd/winbindd_getgrgid.c
-                   winbindd/winbindd_getgrnam.c
-                   winbindd/winbindd_getusersids.c
-                   winbindd/winbindd_lookuprids.c
-                   winbindd/winbindd_setpwent.c
-                   winbindd/winbindd_getpwent.c
-                   winbindd/winbindd_endpwent.c
-                   winbindd/winbindd_setgrent.c
-                   winbindd/winbindd_getgrent.c
-                   winbindd/winbindd_endgrent.c
-                   winbindd/winbindd_dsgetdcname.c
-                   winbindd/winbindd_getdcname.c
-                   winbindd/winbindd_list_users.c
-                   winbindd/winbindd_list_groups.c
-                   winbindd/winbindd_check_machine_acct.c
-                   winbindd/winbindd_change_machine_acct.c
-                   winbindd/winbindd_ping_dc.c
-                   winbindd/winbindd_pam_auth.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'''
-
-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'''
@@ -352,6 +201,8 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.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
                smbd/quotas.c smbd/ntquotas.c smbd/msdfs.c
                smbd/aio.c smbd/statvfs.c
@@ -370,6 +221,10 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/smb2_write.c
                smbd/smb2_lock.c
                smbd/smb2_ioctl.c
+               smbd/smb2_ioctl_dfs.c
+               smbd/smb2_ioctl_filesys.c
+               smbd/smb2_ioctl_named_pipe.c
+               smbd/smb2_ioctl_network_fs.c
                smbd/smb2_keepalive.c
                smbd/smb2_find.c
                smbd/smb2_notify.c
@@ -381,6 +236,8 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/smbXsrv_tcon.c
                smbd/smbXsrv_open.c
                smbd/server_exit.c
+               smbd/durable.c
+               smbd/scavenger.c
                ${MANGLE_SRC}'''
 
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
@@ -400,26 +257,6 @@ PRINTBACKEND_SRC = '''printing/printing.c
                       printing/nt_printing_ads.c
                       printing/queue_process.c'''
 
-NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
-            nmbd/nmbd_become_lmb.c nmbd/nmbd_browserdb.c
-            nmbd/nmbd_browsesync.c nmbd/nmbd_elections.c
-            nmbd/nmbd_incomingdgrams.c nmbd/nmbd_incomingrequests.c
-            nmbd/nmbd_lmhosts.c nmbd/nmbd_logonnames.c nmbd/nmbd_mynames.c
-            nmbd/nmbd_namelistdb.c nmbd/nmbd_namequery.c
-            nmbd/nmbd_nameregister.c nmbd/nmbd_namerelease.c
-            nmbd/nmbd_nodestatus.c nmbd/nmbd_packets.c
-            nmbd/nmbd_processlogon.c nmbd/nmbd_responserecordsdb.c
-            nmbd/nmbd_sendannounce.c nmbd/nmbd_serverlistdb.c
-            nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
-            nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c'''
-
-NMBD_SRC = '${NMBD_SRC1}'
-
-SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
-               web/swat.c web/neg_lang.c'''
-
-SWAT_SRC = '''${SWAT_SRC1}'''
-
 STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
 
 SMBCONTROL_SRC = '''utils/smbcontrol.c'''
@@ -459,29 +296,6 @@ LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
 
 LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
 
-LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
-                    lib/netapi/cm.c
-                    lib/netapi/libnetapi.c
-                    lib/netapi/joindomain.c
-                    lib/netapi/serverinfo.c
-                    lib/netapi/getdc.c
-                    lib/netapi/user.c
-                    lib/netapi/group.c
-                    lib/netapi/localgroup.c
-                    lib/netapi/samr.c
-                    lib/netapi/sid.c
-                    lib/netapi/share.c
-                    lib/netapi/file.c
-                    lib/netapi/shutdown.c
-                    lib/netapi/netlogon.c'''
-
-LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
-
-CLIENT_SRC = '''
-             client/client.c
-             client/clitar.c
-             client/dnsbrowse.c'''
-
 LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
 
 SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
@@ -503,7 +317,7 @@ 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_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
@@ -513,7 +327,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.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_connections.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
@@ -556,17 +370,15 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 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'''
 
-MASKTEST_SRC = '''torture/masktest.c'''
-
 MSGTEST_SRC = '''torture/msgtest.c'''
 
-LOCKTEST_SRC = '''torture/locktest.c'''
-
 PDBTEST_SRC = '''torture/pdbtest.c'''
 
 VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c
@@ -626,7 +438,21 @@ bld.SETUP_BUILD_GROUPS()
 ######################## SUBSYSTEMS #################################
 
 bld.SAMBA3_LIBRARY('netapi',
-                    source=LIBNETAPI_SRC,
+                    source='''lib/netapi/netapi.c
+                    lib/netapi/cm.c
+                    lib/netapi/libnetapi.c
+                    lib/netapi/joindomain.c
+                    lib/netapi/serverinfo.c
+                    lib/netapi/getdc.c
+                    lib/netapi/user.c
+                    lib/netapi/group.c
+                    lib/netapi/localgroup.c
+                    lib/netapi/samr.c
+                    lib/netapi/sid.c
+                    lib/netapi/share.c
+                    lib/netapi/file.c
+                    lib/netapi/shutdown.c
+                    lib/netapi/netlogon.c''',
                     public_deps='''
                     talloc
                     util_cmdline
@@ -638,11 +464,11 @@ bld.SAMBA3_LIBRARY('netapi',
                     libcli_netlogon3
                     LIBCLI_SAMR
                     INIT_SAMR
+                    auth
                     ''',
                     public_headers='../source3/lib/netapi/netapi.h',
                     pc_files='libnet/netapi.pc',
-                    vnum='0',
-                    vars=locals())
+                    vnum='0')
 
 bld.SAMBA3_LIBRARY('smbsharemodes',
                     source=LIBSMBSHAREMODES_SRC,
@@ -657,6 +483,7 @@ 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',
@@ -669,18 +496,19 @@ bld.SAMBA3_LIBRARY('msrpc3',
                    deps='''ndr ndr-standard
                     RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH
                     LIBTSOCKET gse dcerpc-binding
-                    libsmb''',
+                    libsmb
+                    ndr-table''',
                    vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('gpo',
                    source='${LIBGPO_SRC}',
-                   deps='talloc ads TOKEN_UTIL gpext',
+                   deps='talloc ads TOKEN_UTIL gpext auth',
                    vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('AVAHI',
-                    source=AVAHI_SRC,
+                    source='lib/avahi.c smbd/avahi_register.c',
                     deps='avahi-common avahi-client',
                     enabled=bld.env.with_avahi)
 
@@ -692,19 +520,61 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
                     source=TLDAP_SRC,
                     deps='asn1util LIBTSOCKET')
 
+# libpdb.so should not expose internal symbols that are only usable
+# to the statically linked modules that are merged into libpdb.
+# Note that we always filter these symbols out in libpdb, even
+# 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 = 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('pdb',
                    source=PASSDB_SRC,
                    deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping',
-                   private_library=True,
+                   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',
                    vars=locals())
 
+bld.SAMBA3_LIBRARY('smbldaphelper',
+                   source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
+                   deps='smbldap secrets3',
+                   allow_undefined_symbols=True,
+                   enabled=bld.CONFIG_SET('HAVE_LDAP'),
+                   private_library=True)
+
 bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
-                     source=SERVER_MUTEX_SRC,
-                    deps='talloc')
+                     source='lib/server_mutex.c',
+                     deps='talloc')
 
 bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
                     source=PARAM_UTIL_SRC,
@@ -783,8 +653,51 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
                    deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash',
                    vars=locals())
 
+
+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')
+
 bld.SAMBA3_SUBSYSTEM('samba3core',
-                   source=LIB_SRC,
+                   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/id_cache.c
+                   lib/talloc_dict.c
+                   lib/serverid.c
+                   lib/addrchange.c
+                   ../lib/util/debug_s3.c
+                   lib/dumpcore.c
+                   lib/interface.c
+                   lib/username.c
+                   lib/access.c lib/smbrun.c
+                   lib/wins_srv.c
+                   lib/substitute.c
+                   lib/substitute_generic.c
+                   lib/ms_fnmatch.c
+                   lib/tallocmsg.c
+                   lib/dmallocmsg.c
+                   intl/lang_tdb.c
+                   lib/gencache.c
+                   lib/events.c
+                   lib/server_contexts.c
+                   lib/server_prefork.c
+                   lib/server_prefork_util.c
+                   lib/ldap_escape.c
+                   lib/fncall.c
+                   libads/krb5_errs.c
+                   lib/system_smbd.c
+                   lib/audit.c
+                   lib/tevent_wait.c
+                   lib/idmap_cache.c
+                   lib/util_ea.c''',
                    deps='''
                         samba3util
                         LIBTSOCKET
@@ -797,8 +710,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         param
                         dbwrap
                         samba3-util
-                        errors3''',
-                   vars=locals())
+                        errors3
+                        TDB_LIB''')
 
 bld.SAMBA3_LIBRARY('smbd_shim',
                    source='''lib/smbd_shim.c''',
@@ -846,11 +759,14 @@ bld.SAMBA3_LIBRARY('secrets3',
                    vars=locals())
 
 bld.SAMBA3_LIBRARY('smbldap',
-                    source=SMBLDAP_SRC,
+                    source='lib/smbldap.c',
                     deps='ldap lber samba-util param',
-                    vars=locals(),
-                    enabled=bld.env.HAVE_LDAP,
-                    private_library=True,
+                    enabled=bld.CONFIG_SET("HAVE_LDAP"),
+                    private_library=False,
+                    abi_directory='lib/ABI',
+                    abi_match='smbldap_*',
+                    pc_files=[],
+                    vnum='0',
                     public_headers='include/smbldap.h include/smb_ldap.h')
 
 bld.SAMBA3_LIBRARY('ads',
@@ -869,15 +785,13 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
                     deps='samba-util krb5samba',
                    vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('LIBAFS',
-                    source=AFS_SRC,
-                    deps='samba-util',
-                    vars=locals())
-
 bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
-                    source=AFS_SETTOKEN_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    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,
@@ -925,13 +839,14 @@ bld.SAMBA3_LIBRARY('smbd_base',
                     LOCKING
                     LIBADS_SERVER
                     LIBAFS
-                    LIBAFS_SETTOKEN
                     RPC_SERVER
                     NDR_SMBXSRV
                    LIBASYS
                     ccan-hash
                     NDR_SMB_ACL
-                    ''',
+                    netapi
+                   NDR_IOCTL
+                    ''' + bld.env['dmapi_lib'],
                     private_library=True,
                     vars=locals())
 
@@ -1023,17 +938,15 @@ bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
-                    source=PASSCHANGE_SRC,
+                    source='libsmb/passchange.c',
                     deps='''LIBCLI_SAMR
                     INIT_LSA
                     msrpc3
-                    krb5samba''',
-                    vars=locals())
+                    krb5samba''')
 
 bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
-                    source=VERSION_SRC,
-                    deps='samba-util',
-                    vars=locals())
+                    source='lib/version.c',
+                    deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('SLCACHE',
                     source=SLCACHE_SRC,
@@ -1077,11 +990,11 @@ bld.SAMBA3_SUBSYSTEM('errors3',
                      deps='errors')
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
-                    source=LIBCLI_SAMR_SRC,
+                    source='rpc_client/cli_samr.c',
                     deps='RPC_NDR_SAMR')
 
 bld.SAMBA3_LIBRARY('libcli_lsa3',
-                   source=LIBCLI_LSA_SRC,
+                   source='rpc_client/cli_lsarpc.c',
                    deps='RPC_NDR_LSA INIT_LSA',
                    private_library=True)
 
@@ -1091,7 +1004,8 @@ bld.SAMBA3_LIBRARY('libcli_netlogon3',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('cli_spoolss',
-                   source=LIBCLI_SPOOLSS_SRC,
+                   source='''rpc_client/cli_spoolss.c
+                   rpc_client/init_spoolss.c''',
                    deps='RPC_NDR_SPOOLSS param secrets3',
                    private_library=True)
 
@@ -1129,7 +1043,18 @@ bld.SAMBA3_BINARY('smbd/smbd',
                  vars=locals())
 
 bld.SAMBA3_BINARY('nmbd/nmbd',
-                 source=NMBD_SRC,
+                 source='''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
+                 nmbd/nmbd_become_lmb.c nmbd/nmbd_browserdb.c
+                 nmbd/nmbd_browsesync.c nmbd/nmbd_elections.c
+                 nmbd/nmbd_incomingdgrams.c nmbd/nmbd_incomingrequests.c
+                 nmbd/nmbd_lmhosts.c nmbd/nmbd_logonnames.c nmbd/nmbd_mynames.c
+                 nmbd/nmbd_namelistdb.c nmbd/nmbd_namequery.c
+                 nmbd/nmbd_nameregister.c nmbd/nmbd_namerelease.c
+                 nmbd/nmbd_nodestatus.c nmbd/nmbd_packets.c
+                 nmbd/nmbd_processlogon.c nmbd/nmbd_responserecordsdb.c
+                 nmbd/nmbd_sendannounce.c nmbd/nmbd_serverlistdb.c
+                 nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
+                 nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c''',
                  deps='''
                  talloc
                  tevent
@@ -1137,11 +1062,100 @@ bld.SAMBA3_BINARY('nmbd/nmbd',
                  libsmb
                  popt_samba3
                  PROFILE''',
-                 install_path='${SBINDIR}',
-                 vars=locals())
+                 install_path='${SBINDIR}')
+
+
+bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE',
+                     source='lib/tdb_validate.c',
+                     deps='samba-util')
+
 
 bld.SAMBA3_BINARY('winbindd/winbindd',
-                 source=WINBINDD_SRC,
+                 source='''winbindd/winbindd.c
+                 winbindd/winbindd_group.c
+                 winbindd/winbindd_util.c
+                 winbindd/winbindd_cache.c
+                 winbindd/winbindd_pam.c
+                 winbindd/winbindd_misc.c
+                 winbindd/winbindd_cm.c
+                 winbindd/winbindd_wins_byip.c
+                 winbindd/winbindd_wins_byname.c
+                 winbindd/winbindd_msrpc.c
+                 winbindd/winbindd_rpc.c
+                 winbindd/winbindd_reconnect.c
+                 winbindd/winbindd_ads.c
+                 winbindd/winbindd_samr.c
+                 winbindd/winbindd_dual.c
+                 winbindd/winbindd_dual_ndr.c
+                 winbindd/winbindd_dual_srv.c
+                 winbindd/winbindd_async.c
+                 winbindd/winbindd_creds.c
+                 winbindd/winbindd_cred_cache.c
+                 winbindd/winbindd_ccache_access.c
+                 winbindd/winbindd_domain.c
+                 winbindd/winbindd_idmap.c
+                 winbindd/winbindd_locator.c
+                 winbindd/winbindd_ndr.c
+                 winbindd/wb_ping.c
+                 winbindd/wb_lookupsid.c
+                 winbindd/wb_lookupsids.c
+                 winbindd/wb_lookupname.c
+                 winbindd/wb_uid2sid.c
+                 winbindd/wb_gid2sid.c
+                 winbindd/wb_sids2xids.c
+                 winbindd/wb_queryuser.c
+                 winbindd/wb_lookupuseraliases.c
+                 winbindd/wb_lookupusergroups.c
+                 winbindd/wb_getpwsid.c
+                 winbindd/wb_gettoken.c
+                 winbindd/wb_seqnum.c
+                 winbindd/wb_seqnums.c
+                 winbindd/wb_group_members.c
+                 winbindd/wb_getgrsid.c
+                 winbindd/wb_query_user_list.c
+                 winbindd/wb_fill_pwent.c
+                 winbindd/wb_next_pwent.c
+                 winbindd/wb_next_grent.c
+                 winbindd/wb_dsgetdcname.c
+                 winbindd/winbindd_lookupsid.c
+                 winbindd/winbindd_lookupsids.c
+                 winbindd/winbindd_lookupname.c
+                 winbindd/winbindd_sid_to_uid.c
+                 winbindd/winbindd_sid_to_gid.c
+                 winbindd/winbindd_uid_to_sid.c
+                 winbindd/winbindd_gid_to_sid.c
+                 winbindd/winbindd_sids_to_xids.c
+                 winbindd/winbindd_allocate_uid.c
+                 winbindd/winbindd_allocate_gid.c
+                 winbindd/winbindd_getpwsid.c
+                 winbindd/winbindd_getpwnam.c
+                 winbindd/winbindd_getpwuid.c
+                 winbindd/winbindd_getsidaliases.c
+                 winbindd/winbindd_getuserdomgroups.c
+                 winbindd/winbindd_getgroups.c
+                 winbindd/winbindd_show_sequence.c
+                 winbindd/winbindd_getgrgid.c
+                 winbindd/winbindd_getgrnam.c
+                 winbindd/winbindd_getusersids.c
+                 winbindd/winbindd_lookuprids.c
+                 winbindd/winbindd_setpwent.c
+                 winbindd/winbindd_getpwent.c
+                 winbindd/winbindd_endpwent.c
+                 winbindd/winbindd_setgrent.c
+                 winbindd/winbindd_getgrent.c
+                 winbindd/winbindd_endgrent.c
+                 winbindd/winbindd_dsgetdcname.c
+                 winbindd/winbindd_getdcname.c
+                 winbindd/winbindd_list_users.c
+                 winbindd/winbindd_list_groups.c
+                 winbindd/winbindd_check_machine_acct.c
+                 winbindd/winbindd_change_machine_acct.c
+                 winbindd/winbindd_ping_dc.c
+                 winbindd/winbindd_pam_auth.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''',
                  deps='''
                  talloc
                  tevent
@@ -1163,30 +1177,10 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  RPC_NCACN_NP
                  RPC_PIPE_REGISTER
                  WB_REQTRANS
+                 TDB_VALIDATE
                  ''',
                  enabled=bld.env.build_winbind,
-                 install_path='${SBINDIR}',
-                 vars=locals())
-
-bld.SAMBA3_BINARY('web/swat',
-                 source=SWAT_SRC,
-                 deps='''
-                 talloc
-                 tevent
-                 samba3core
-                 libsmb
-                 param
-                 pdb
-                 popt_samba3
-                 LOCKING
-                 PLAINTEXT_AUTH
-                 PASSCHANGE
-                 PRINTBASE
-                 PRINTING
-                 ''',
-                 enabled=bld.env.build_swat,
-                 install_path='${SBINDIR}',
-                 vars=locals())
+                 install_path='${SBINDIR}')
 
 bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  source=RPCCLIENT_SRC,
@@ -1221,7 +1215,9 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  vars=locals())
 
 bld.SAMBA3_BINARY('client/smbclient',
-                 source=CLIENT_SRC,
+                 source='''client/client.c
+                 client/clitar.c
+                 client/dnsbrowse.c''',
                  deps='''
                  talloc
                  popt_samba3
@@ -1239,7 +1235,7 @@ bld.SAMBA3_BINARY('net',
                  talloc
                  netapi
                  addns
-                 intl
+                 samba_intl
                  popt_samba3
                  pdb
                  libsmb
@@ -1249,6 +1245,7 @@ bld.SAMBA3_BINARY('net',
                  msrpc3
                  gpo
                  ads
+                 smbd_base
                  LIBADS_SERVER
                  LIBADS_PRINTER
                  SMBREADLINE
@@ -1314,6 +1311,7 @@ bld.SAMBA3_BINARY('smbstatus',
                  talloc
                  param
                  popt_samba3
+                 smbd_base
                  LOCKING
                  PROFILE''',
                  vars=locals())
@@ -1390,6 +1388,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                 NDR_OPEN_FILES
                 idmap
                  ''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbconftort',
@@ -1398,6 +1397,7 @@ bld.SAMBA3_BINARY('smbconftort',
                  talloc
                  param
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('replacetort',
@@ -1405,19 +1405,12 @@ bld.SAMBA3_BINARY('replacetort',
                  deps='replace replace-test',
                  install=False)
 
-bld.SAMBA3_BINARY('masktest' + bld.env.suffix3,
-                 source=MASKTEST_SRC,
-                 deps='''
-                 talloc
-                 param
-                 libsmb''',
-                 vars=locals())
-
 bld.SAMBA3_BINARY('msgtest',
                  source=MSGTEST_SRC,
                  deps='''
                  talloc
                  param''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbcacls',
@@ -1455,15 +1448,6 @@ bld.SAMBA3_BINARY('sharesec',
                  popt_samba3''',
                  vars=locals())
 
-bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
-                 source=LOCKTEST_SRC,
-                 deps='''
-                 talloc
-                 param
-                 libsmb
-                 LOCKING''',
-                 vars=locals())
-
 bld.SAMBA3_BINARY('pdbtest',
                  source=PDBTEST_SRC,
                  deps='''
@@ -1472,6 +1456,7 @@ bld.SAMBA3_BINARY('pdbtest',
                  popt_samba3
                  AUTH_COMMON
                  auth''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('vfstest',
@@ -1480,11 +1465,13 @@ bld.SAMBA3_BINARY('vfstest',
                  vfs
                  popt_samba3
                  SMBREADLINE''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('log2pcap',
                  source=LOG2PCAP_SRC,
                  deps='''talloc popt''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('locktest2',
@@ -1494,11 +1481,13 @@ bld.SAMBA3_BINARY('locktest2',
                  param
                  libsmb
                  LOCKING''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('debug2html',
                  source=DEBUG2HTML_SRC,
                  deps='''talloc popt''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbfilter',
@@ -1507,6 +1496,7 @@ bld.SAMBA3_BINARY('smbfilter',
                  talloc
                  param
                  LIBNMB''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('versiontest',
@@ -1514,9 +1504,10 @@ bld.SAMBA3_BINARY('versiontest',
                  deps='''
                  SAMBA_VERSION
                  param''',
+                 install=False,
                  vars=locals())
 
-bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
+bld.SAMBA3_BINARY('ntlm_auth',
                  source=NTLM_AUTH_SRC,
                  deps='''
                  talloc
@@ -1529,6 +1520,7 @@ bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
 
 bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('rpc_open_tcp',
@@ -1536,6 +1528,7 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
                  deps='''
                  talloc
                  msrpc3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('test_lp_load',
@@ -1544,6 +1537,7 @@ bld.SAMBA3_BINARY('test_lp_load',
                  talloc
                  param
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('dbwrap_tool',
@@ -1558,6 +1552,7 @@ bld.SAMBA3_BINARY('dbwrap_torture',
                  deps='''
                  talloc
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('split_tokens',
@@ -1565,6 +1560,7 @@ bld.SAMBA3_BINARY('split_tokens',
                  deps='''
                  talloc
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('vlp',
@@ -1572,6 +1568,7 @@ bld.SAMBA3_BINARY('vlp',
                  deps='''
                  talloc
                  param''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_PYTHON('pysmbd',
@@ -1586,9 +1583,14 @@ bld.SAMBA3_PYTHON('pylibsmb',
                   realname='samba/samba3/libsmb_samba_internal.so'
                   )
 
-swat_dir = os.path.join(bld.curdir, '../swat')
-swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
-bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
+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""",
+                  deps='ncurses menu panel form registry param popt_samba3 smbregistry',
+                  enabled=bld.env.build_regedit,
+                  vars=locals())
 
 ########################## INCLUDES #################################
 
@@ -1603,6 +1605,7 @@ bld.RECURSE('modules')
 bld.RECURSE('pam_smbpass')
 bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
+bld.RECURSE('script')
 bld.RECURSE('winbindd')
 bld.RECURSE('../examples/auth')
 bld.RECURSE('../examples/libsmbclient')
@@ -1614,4 +1617,3 @@ bld.RECURSE('lib/netapi/examples')
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()
 
-bld.SYMBOL_CHECK()