s3-waf: build testparm and winbindd

1 files changed, 425 insertions, 270 deletions

diff --git a/source3/wscript_build b/source3/wscript_build
index 8b2fb90cb5..4e590205dd 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,10 @@
 from samba_utils import *
 
 TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
-	  lib/dbwrap.c lib/dbwrap_tdb.c
-	  lib/dbwrap_ctdb.c
-	  lib/g_lock.c
-	  lib/dbwrap_rbt.c'''
+          lib/dbwrap.c lib/dbwrap_tdb.c
+          lib/dbwrap_ctdb.c
+          lib/g_lock.c
+          lib/dbwrap_rbt.c'''
 
 TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
 
@@ -27,62 +27,62 @@ SERVER_MUTEX_SRC = 'lib/server_mutex.c'
 PASSCHANGE_SRC = '''libsmb/passchange.c'''
 
 LIBNDR_DRSUAPI_SRC = '''../librpc/ndr/ndr_drsuapi.c
-		     ../librpc/ndr/ndr_compression.c
-		     ../librpc/gen_ndr/ndr_drsuapi.c
-		     ../librpc/ndr/ndr_drsblobs.c
-		     ../librpc/gen_ndr/ndr_drsblobs.c'''
+                     ../librpc/ndr/ndr_compression.c
+                     ../librpc/gen_ndr/ndr_drsuapi.c
+                     ../librpc/ndr/ndr_drsblobs.c
+                     ../librpc/gen_ndr/ndr_drsblobs.c'''
 
 ZLIB_SRC = '''${ZLIB_SRCS}'''
 
 COMPRESSION_SRC = '''../lib/compression/mszip.c
-				  ../lib/compression/lzxpress.c
-				  ${ZLIB_SRC}'''
+                                  ../lib/compression/lzxpress.c
+                                  ${ZLIB_SRC}'''
 
 DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
-	      ${COMPRESSION_SRC}'''
+              ${COMPRESSION_SRC}'''
 
 LIBNDR_NTLMSSP_SRC = '''../librpc/gen_ndr/ndr_ntlmssp.c
-		     ../librpc/ndr/ndr_ntlmssp.c'''
+                     ../librpc/ndr/ndr_ntlmssp.c'''
 
 LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
-	     ../librpc/ndr/ndr.c
-	     ../librpc/ndr/ndr_misc.c
-	     ../librpc/gen_ndr/ndr_misc.c
-	     ../librpc/gen_ndr/ndr_security.c
-	     ../librpc/ndr/ndr_sec_helper.c
-	     librpc/ndr/ndr_string.c
-	     ../librpc/ndr/uuid.c
-	     librpc/ndr/util.c
-	     ../librpc/gen_ndr/ndr_dcerpc.c'''
+             ../librpc/ndr/ndr.c
+             ../librpc/ndr/ndr_misc.c
+             ../librpc/gen_ndr/ndr_misc.c
+             ../librpc/gen_ndr/ndr_security.c
+             ../librpc/ndr/ndr_sec_helper.c
+             librpc/ndr/ndr_string.c
+             ../librpc/ndr/uuid.c
+             librpc/ndr/util.c
+             ../librpc/gen_ndr/ndr_dcerpc.c'''
 
 RPCCLIENT_NDR_SRC = '''rpc_client/ndr.c'''
 
 LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
-		  ../librpc/gen_ndr/ndr_lsa.c'''
+                  ../librpc/gen_ndr/ndr_lsa.c'''
 
 LIBNDR_GEN_SRC1 = '''../librpc/gen_ndr/ndr_netlogon.c
-		  ../librpc/ndr/ndr_netlogon.c'''
+                  ../librpc/ndr/ndr_netlogon.c'''
 
 LIBNDR_GEN_SRC2 = '''../librpc/gen_ndr/ndr_spoolss.c
-		  ../librpc/ndr/ndr_spoolss_buf.c'''
+                  ../librpc/ndr/ndr_spoolss_buf.c'''
 
 LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
-		 ${LIBNDR_GEN_SRC0}
-		 ../librpc/gen_ndr/ndr_dfs.c
-		 ../librpc/gen_ndr/ndr_echo.c
-		 ../librpc/gen_ndr/ndr_winreg.c
-		 ../librpc/gen_ndr/ndr_initshutdown.c
-		 ../librpc/gen_ndr/ndr_srvsvc.c
-		 ../librpc/gen_ndr/ndr_eventlog.c
-		 ${LIBNDR_GEN_SRC1}
-		 ../librpc/gen_ndr/ndr_dssetup.c
-		 librpc/gen_ndr/ndr_notify.c
-		 ../librpc/gen_ndr/ndr_xattr.c
-		 ../librpc/ndr/ndr_xattr.c
-		 ../librpc/gen_ndr/ndr_epmapper.c
-		 ../librpc/gen_ndr/ndr_named_pipe_auth.c
-		 ../librpc/gen_ndr/ndr_ntsvcs.c
-		 ${LIBNDR_GEN_SRC2}'''
+                 ${LIBNDR_GEN_SRC0}
+                 ../librpc/gen_ndr/ndr_dfs.c
+                 ../librpc/gen_ndr/ndr_echo.c
+                 ../librpc/gen_ndr/ndr_winreg.c
+                 ../librpc/gen_ndr/ndr_initshutdown.c
+                 ../librpc/gen_ndr/ndr_srvsvc.c
+                 ../librpc/gen_ndr/ndr_eventlog.c
+                 ${LIBNDR_GEN_SRC1}
+                 ../librpc/gen_ndr/ndr_dssetup.c
+                 librpc/gen_ndr/ndr_notify.c
+                 ../librpc/gen_ndr/ndr_xattr.c
+                 ../librpc/ndr/ndr_xattr.c
+                 ../librpc/gen_ndr/ndr_epmapper.c
+                 ../librpc/gen_ndr/ndr_named_pipe_auth.c
+                 ../librpc/gen_ndr/ndr_ntsvcs.c
+                 ${LIBNDR_GEN_SRC2}'''
 
 RPC_PARSE_SRC0 = '''rpc_parse/parse_prs.c rpc_parse/parse_misc.c'''
 
@@ -91,8 +91,8 @@ RPC_PARSE_SRC0 = '''rpc_parse/parse_prs.c rpc_parse/parse_misc.c'''
 RPC_PARSE_SRC1 = '''${RPC_PARSE_SRC0}'''
 
 RPC_PARSE_SRC2 = '''rpc_parse/parse_rpc.c
-		 rpc_client/init_netlogon.c
-		 rpc_client/init_lsa.c'''
+                 rpc_client/init_netlogon.c
+                 rpc_client/init_lsa.c'''
 
 LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
 
@@ -100,26 +100,26 @@ SOCKET_WRAPPER_SRC = '''${SOCKET_WRAPPER_SRCS}'''
 NSS_WRAPPER_SRC = '''${NSS_WRAPPER_SRCS}'''
 
 LIBSAMBAUTIL_SRC = '''
-		${LIBREPLACE_SRC}
-		${SOCKET_WRAPPER_SRC}
-		${NSS_WRAPPER_SRC}'''
+                ${LIBREPLACE_SRC}
+                ${SOCKET_WRAPPER_SRC}
+                ${NSS_WRAPPER_SRC}'''
 
 UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
-		   ../lib/util/xfile.c ../lib/util/util_strlist.c
-		   ../lib/util/util_file.c ../lib/util/data_blob.c
-		   ../lib/util/util.c ../lib/util/fsusage.c
-		   ../lib/util/params.c ../lib/util/talloc_stack.c
-		   ../lib/util/genrand.c ../lib/util/util_net.c
-		   ../lib/util/become_daemon.c ../lib/util/system.c
-		   ../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
-		   ../lib/util/smb_threads.c ../lib/util/util_id.c
-		   ../lib/util/blocking.c ../lib/util/rfc1738.c '''
+                   ../lib/util/xfile.c ../lib/util/util_strlist.c
+                   ../lib/util/util_file.c ../lib/util/data_blob.c
+                   ../lib/util/util.c ../lib/util/fsusage.c
+                   ../lib/util/params.c ../lib/util/talloc_stack.c
+                   ../lib/util/genrand.c ../lib/util/util_net.c
+                   ../lib/util/become_daemon.c ../lib/util/system.c
+                   ../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
+                   ../lib/util/smb_threads.c ../lib/util/util_id.c
+                   ../lib/util/blocking.c ../lib/util/rfc1738.c '''
 
 CRYPTO_SRC = '''../lib/crypto/crc32.c ../lib/crypto/md5.c
-			 ../lib/crypto/hmacmd5.c ../lib/crypto/arcfour.c
-			 ../lib/crypto/md4.c
-			 ../lib/crypto/sha256.c ../lib/crypto/hmacsha256.c
-			 ../lib/crypto/aes.c ../lib/crypto/rijndael-alg-fst.c'''
+                         ../lib/crypto/hmacmd5.c ../lib/crypto/arcfour.c
+                         ../lib/crypto/md4.c
+                         ../lib/crypto/sha256.c ../lib/crypto/hmacsha256.c
+                         ../lib/crypto/aes.c ../lib/crypto/rijndael-alg-fst.c'''
 
 LIBTEVENT_SRC0 = ''
 
@@ -142,40 +142,40 @@ NSS_WRAPPER_SRCS = ''
 ZLIB_SRCS = ''
 
 LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC}
-	  lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
-	  lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
-	  lib/interfaces.c lib/memcache.c
-	  lib/talloc_dict.c
-	  lib/serverid.c
-	  lib/util_transfer_file.c ../lib/async_req/async_sock.c
-	  ${TDB_LIB_SRC}
-	  ${VERSION_SRC} lib/charcnv.c lib/debug.c lib/fault.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/util_pw.c lib/access.c lib/smbrun.c
-	  lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
-	  lib/wins_srv.c
-	  lib/util_str.c lib/clobber.c lib/util_sid.c lib/util_uuid.c
-	  lib/util_unistr.c lib/util_file.c
-	  lib/util.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c
-	  lib/substitute.c lib/dbwrap_util.c
-	  lib/ms_fnmatch.c lib/select.c lib/errmap_unix.c
-	  lib/tallocmsg.c lib/dmallocmsg.c
-	  libsmb/clisigning.c libsmb/smb_signing.c
-	  lib/iconv.c lib/pam_errors.c 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/ldap_escape.c ${CHARSET_STATIC}
-	  lib/secdesc.c lib/util_seaccess.c ../libcli/security/secace.c
-	  ../libcli/security/sddl.c
-	  ../libcli/security/secacl.c ${PTHREADPOOL_SRC}
-	  lib/fncall.c
-	  libads/krb5_errs.c lib/system_smbd.c lib/audit.c ${LIBNDR_SRC}
-	  lib/file_id.c lib/idmap_cache.c
-	  ../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c'''
+          lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
+          lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
+          lib/interfaces.c lib/memcache.c
+          lib/talloc_dict.c
+          lib/serverid.c
+          lib/util_transfer_file.c ../lib/async_req/async_sock.c
+          ${TDB_LIB_SRC}
+          ${VERSION_SRC} lib/charcnv.c lib/debug.c lib/fault.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/util_pw.c lib/access.c lib/smbrun.c
+          lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
+          lib/wins_srv.c
+          lib/util_str.c lib/clobber.c lib/util_sid.c lib/util_uuid.c
+          lib/util_unistr.c lib/util_file.c
+          lib/util.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c
+          lib/substitute.c lib/dbwrap_util.c
+          lib/ms_fnmatch.c lib/select.c lib/errmap_unix.c
+          lib/tallocmsg.c lib/dmallocmsg.c
+          libsmb/clisigning.c libsmb/smb_signing.c
+          lib/iconv.c lib/pam_errors.c 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/ldap_escape.c ${CHARSET_STATIC}
+          lib/secdesc.c lib/util_seaccess.c ../libcli/security/secace.c
+          ../libcli/security/sddl.c
+          ../libcli/security/secacl.c ${PTHREADPOOL_SRC}
+          lib/fncall.c
+          libads/krb5_errs.c lib/system_smbd.c lib/audit.c ${LIBNDR_SRC}
+          lib/file_id.c lib/idmap_cache.c
+          ../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c'''
 
 LIB_DUMMY_SRC = '''lib/dummysmbd.c lib/dummyroot.c'''
 LIB_NONSMBD_SRC = '''${LIB_SRC} ${LIB_DUMMY_SRC}'''
@@ -193,40 +193,40 @@ PARAM_SRC = '''${PARAM_WITHOUT_REG_SRC} ${PARAM_REG_ADD_SRC}'''
 KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
 
 LIBADDNS_SRC0 = '''libaddns/dnsrecord.c libaddns/dnsutils.c  libaddns/dnssock.c
-	       libaddns/dnsgss.c libaddns/dnsmarshall.c'''
+               libaddns/dnsgss.c libaddns/dnsmarshall.c'''
 LIBADDNS_SRC = '''${LIBADDNS_SRC0} ${SOCKET_WRAPPER_SRC}'''
 
 GPEXT_SRC = '''../libgpo/gpext/gpext.c ${GPEXT_STATIC}'''
 
 LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
-	      ../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
-	      libgpo/gpo_reg.c
-	      ${GPEXT_SRC}'''
+              ../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
+              libgpo/gpo_reg.c
+              ${GPEXT_SRC}'''
 LIBGPO_SRC = '''${LIBGPO_SRC0}'''
 
 LIBADS_SRC = '''libads/ldap.c libads/ldap_printer.c
-	     libads/sasl.c libads/sasl_wrapping.c
-	     libads/krb5_setpw.c libads/ldap_user.c
-	     libads/ads_struct.c libads/kerberos_keytab.c
+             libads/sasl.c libads/sasl_wrapping.c
+             libads/krb5_setpw.c libads/ldap_user.c
+             libads/ads_struct.c libads/kerberos_keytab.c
              libads/disp_sec.c libads/ads_utils.c libads/ldap_utils.c
-	     libads/ldap_schema.c libads/util.c libads/ndr.c'''
+             libads/ldap_schema.c libads/util.c libads/ndr.c'''
 
 LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
-		    ../librpc/ndr/ndr_krb5pac.c
-		    ../librpc/gen_ndr/ndr_krb5pac.c'''
+                    ../librpc/ndr/ndr_krb5pac.c
+                    ../librpc/gen_ndr/ndr_krb5pac.c'''
 
 SECRETS_SRC = '''librpc/gen_ndr/ndr_secrets.c'''
 
 LIBNBT_SRC = '''../libcli/nbt/nbtname.c
-	     ../libcli/netlogon.c
-	     ../libcli/ndr_netlogon.c
-	     ../librpc/gen_ndr/ndr_nbt.c
-	     ../librpc/gen_ndr/ndr_svcctl.c
-	     ../librpc/ndr/ndr_svcctl.c'''
+             ../libcli/netlogon.c
+             ../libcli/ndr_netlogon.c
+             ../librpc/gen_ndr/ndr_nbt.c
+             ../librpc/gen_ndr/ndr_svcctl.c
+             ../librpc/ndr/ndr_svcctl.c'''
 
 LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
-	     libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
-	     libads/dns.c libads/sitename_cache.c'''
+             libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
+             libads/dns.c libads/sitename_cache.c'''
 
 NTERR_SRC = '''libsmb/nterr.c libsmb/smberr.c'''
 DOSERR_SRC = '../libcli/util/doserr.c'
@@ -238,84 +238,84 @@ LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SR
 LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
 
 LIBSMB_ERR_SRC = '''${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}
-		 ${RPC_PARSE_SRC1}
-		 ${SECRETS_SRC}'''
+                 ${RPC_PARSE_SRC1}
+                 ${SECRETS_SRC}'''
 
 LIBSMB_SRC0 = '''
-	       ../libcli/auth/ntlm_check.c
-	       libsmb/ntlmssp.c
-	       libsmb/ntlmssp_sign.c
-	       ${LIBNDR_NTLMSSP_SRC}
-	       ../libcli/auth/ntlmssp_ndr.c'''
+               ../libcli/auth/ntlm_check.c
+               libsmb/ntlmssp.c
+               libsmb/ntlmssp_sign.c
+               ${LIBNDR_NTLMSSP_SRC}
+               ../libcli/auth/ntlmssp_ndr.c'''
 
 LIBSAMBA_SRC = '''${LIBSMB_SRC0}
-	       ${LIBSMB_ERR_SRC}'''
+               ${LIBSMB_ERR_SRC}'''
 
 LIBCLI_LDAP_MESSAGE_SRC = '''../libcli/ldap/ldap_message.c'''
 LIBCLI_LDAP_NDR_SRC = '''../libcli/ldap/ldap_ndr.c'''
 
 LIBTSOCKET_SRC = '''../lib/tsocket/tsocket.c
-		../lib/tsocket/tsocket_helpers.c
-		../lib/tsocket/tsocket_bsd.c'''
+                ../lib/tsocket/tsocket_helpers.c
+                ../lib/tsocket/tsocket_bsd.c'''
 
 CLDAP_SRC = '''libads/cldap.c
-	../libcli/cldap/cldap.c
-	../lib/util/idtree.c
-	${LIBCLI_LDAP_MESSAGE_SRC} ${LIBCLI_LDAP_NDR_SRC} ${LIBTSOCKET_SRC}'''
+        ../libcli/cldap/cldap.c
+        ../lib/util/idtree.c
+        ${LIBCLI_LDAP_MESSAGE_SRC} ${LIBCLI_LDAP_NDR_SRC} ${LIBTSOCKET_SRC}'''
 
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
 SCHANNEL_SRC = '''../libcli/auth/credentials.c
-	       ../libcli/auth/schannel_sign.c
-	       ../libcli/auth/schannel_state_tdb.c
-	       ../librpc/gen_ndr/ndr_schannel.c
-	       ../librpc/ndr/ndr_schannel.c'''
+               ../libcli/auth/schannel_sign.c
+               ../libcli/auth/schannel_state_tdb.c
+               ../librpc/gen_ndr/ndr_schannel.c
+               ../librpc/ndr/ndr_schannel.c'''
 
 LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
-	     libsmb/clikrb5.c libsmb/clispnego.c
-	     ../libcli/auth/spnego_parse.c
-	     ../lib/util/asn1.c
-	     libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
-	     libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.c
-	     libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
-	     libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
-	     libsmb/clioplock.c libsmb/clirap2.c
-	     libsmb/smb_seal.c libsmb/async_smb.c
-	     ${LIBSAMBA_SRC}
-	     ${LIBNMB_SRC}
-	     ${LIBNBT_SRC}
-	     ${CLDAP_SRC}
-	     ${DRSUAPI_SRC}'''
+             libsmb/clikrb5.c libsmb/clispnego.c
+             ../libcli/auth/spnego_parse.c
+             ../lib/util/asn1.c
+             libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
+             libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.c
+             libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
+             libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
+             libsmb/clioplock.c libsmb/clirap2.c
+             libsmb/smb_seal.c libsmb/async_smb.c
+             ${LIBSAMBA_SRC}
+             ${LIBNMB_SRC}
+             ${LIBNBT_SRC}
+             ${CLDAP_SRC}
+             ${DRSUAPI_SRC}'''
 
 RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c
-		  ${SCHANNEL_SRC}'''
+                  ${SCHANNEL_SRC}'''
 
 LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c
-	       ${RPC_CLIENT_SRC1}
-	       ${RPC_CLIENT_SRC}
-	       rpc_client/cli_spoolss.c
-	       rpc_client/init_spoolss.c
-	       rpc_client/init_samr.c
-		   ../librpc/rpc/binding.c'''
+               ${RPC_CLIENT_SRC1}
+               ${RPC_CLIENT_SRC}
+               rpc_client/cli_spoolss.c
+               rpc_client/init_spoolss.c
+               rpc_client/init_samr.c
+                   ../librpc/rpc/binding.c'''
 
 LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
-		   ../librpc/gen_ndr/cli_dfs.c
-		   ../librpc/gen_ndr/cli_echo.c
-		   ../librpc/gen_ndr/cli_srvsvc.c
-		   ../librpc/gen_ndr/cli_svcctl.c
-		   ../librpc/gen_ndr/cli_winreg.c
-		   ../librpc/gen_ndr/cli_initshutdown.c
-		   ../librpc/gen_ndr/cli_eventlog.c
-		   ../librpc/gen_ndr/cli_wkssvc.c
-		   ../librpc/gen_ndr/cli_netlogon.c
-		   ../librpc/gen_ndr/cli_samr.c
-		   ../librpc/gen_ndr/cli_dssetup.c
-		   ../librpc/gen_ndr/cli_ntsvcs.c
-		   ../librpc/gen_ndr/cli_epmapper.c
-		   ../librpc/gen_ndr/cli_drsuapi.c
-		   ../librpc/gen_ndr/cli_spoolss.c
-		   ${LIBNDR_GEN_SRC}
-		   ${RPCCLIENT_NDR_SRC}'''
+                   ../librpc/gen_ndr/cli_dfs.c
+                   ../librpc/gen_ndr/cli_echo.c
+                   ../librpc/gen_ndr/cli_srvsvc.c
+                   ../librpc/gen_ndr/cli_svcctl.c
+                   ../librpc/gen_ndr/cli_winreg.c
+                   ../librpc/gen_ndr/cli_initshutdown.c
+                   ../librpc/gen_ndr/cli_eventlog.c
+                   ../librpc/gen_ndr/cli_wkssvc.c
+                   ../librpc/gen_ndr/cli_netlogon.c
+                   ../librpc/gen_ndr/cli_samr.c
+                   ../librpc/gen_ndr/cli_dssetup.c
+                   ../librpc/gen_ndr/cli_ntsvcs.c
+                   ../librpc/gen_ndr/cli_epmapper.c
+                   ../librpc/gen_ndr/cli_drsuapi.c
+                   ../librpc/gen_ndr/cli_spoolss.c
+                   ${LIBNDR_GEN_SRC}
+                   ${RPCCLIENT_NDR_SRC}'''
 
 #
 # registry-related objects
@@ -336,76 +336,76 @@ REG_BACKENDS_BASE_SRC = '''registry/reg_backend_db.c'''
 REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
 
 REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
-			 registry/reg_backend_shares.c
-			 registry/reg_backend_netlogon_params.c
-			 registry/reg_backend_prod_options.c
-			 registry/reg_backend_tcpip_params.c
-			 registry/reg_backend_hkpt_params.c
-			 registry/reg_backend_current_version.c
-			 registry/reg_backend_perflib.c'''
+                         registry/reg_backend_shares.c
+                         registry/reg_backend_netlogon_params.c
+                         registry/reg_backend_prod_options.c
+                         registry/reg_backend_tcpip_params.c
+                         registry/reg_backend_hkpt_params.c
+                         registry/reg_backend_current_version.c
+                         registry/reg_backend_perflib.c'''
 
 REG_BASE_SRC = '''registry/reg_api.c
-	       registry/reg_dispatcher.c
-	       registry/reg_cachehook.c
-	       ${REGFIO_SRC}
-	       ${REGSRCS_SRC}
-	       registry/reg_util.c
-	       ${UTIL_REG_API_SRC}
-	       lib/util_nttoken.c
-	       ${REG_BACKENDS_BASE_SRC}
-	       ${REG_INIT_BASIC_SRC}'''
+               registry/reg_dispatcher.c
+               registry/reg_cachehook.c
+               ${REGFIO_SRC}
+               ${REGSRCS_SRC}
+               registry/reg_util.c
+               ${UTIL_REG_API_SRC}
+               lib/util_nttoken.c
+               ${REG_BACKENDS_BASE_SRC}
+               ${REG_INIT_BASIC_SRC}'''
 
 REG_SMBCONF_SRC = '''${REG_BASE_SRC}
-		  ${REG_BACKENDS_SMBCONF_SRC}
-		  ${REG_INIT_SMBCONF_SRC}'''
+                  ${REG_BACKENDS_SMBCONF_SRC}
+                  ${REG_INIT_SMBCONF_SRC}'''
 
 REG_FULL_SRC = '''${REG_SMBCONF_SRC}
-	       ${REG_BACKENDS_EXTRA_SRC}
-	       ${REG_INIT_FULL_SRC}
-	       registry/reg_eventlog.c
-	       registry/reg_perfcount.c
-	       librpc/gen_ndr/ndr_perfcount.c
-	       registry/reg_util_legacy.c'''
+               ${REG_BACKENDS_EXTRA_SRC}
+               ${REG_INIT_FULL_SRC}
+               registry/reg_eventlog.c
+               registry/reg_perfcount.c
+               librpc/gen_ndr/ndr_perfcount.c
+               registry/reg_util_legacy.c'''
 
 LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
 
 RPC_LSA_SRC = '''rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c'''
 
 RPC_NETLOG_SRC = '''rpc_server/srv_netlog_nt.c
-		 ../librpc/gen_ndr/srv_netlogon.c'''
+                 ../librpc/gen_ndr/srv_netlogon.c'''
 
 RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c
                rpc_server/srv_samr_util.c
-	       ../librpc/gen_ndr/srv_samr.c'''
+               ../librpc/gen_ndr/srv_samr.c'''
 
 RPC_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_initshutdown_nt.c'''
 
 RPC_REG_SRC = ''' rpc_server/srv_winreg_nt.c
-	       ../librpc/gen_ndr/srv_winreg.c'''
+               ../librpc/gen_ndr/srv_winreg.c'''
 
 RPC_DSSETUP_SRC = ''' rpc_server/srv_dssetup_nt.c ../librpc/gen_ndr/srv_dssetup.c'''
 
 RPC_SVC_SRC = '''rpc_server/srv_srvsvc_nt.c
-	      ../librpc/gen_ndr/srv_srvsvc.c'''
+              ../librpc/gen_ndr/srv_srvsvc.c'''
 
 RPC_WKS_SRC = ''' ../librpc/gen_ndr/srv_wkssvc.c rpc_server/srv_wkssvc_nt.c'''
 
 RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c
-		  ../librpc/gen_ndr/srv_svcctl.c
+                  ../librpc/gen_ndr/srv_svcctl.c
                   services/svc_spoolss.c services/svc_rcinit.c services/services_db.c
                   services/svc_netlogon.c services/svc_winreg.c
                   services/svc_wins.c'''
 
 RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c
-		 ../librpc/gen_ndr/srv_ntsvcs.c'''
+                 ../librpc/gen_ndr/srv_ntsvcs.c'''
 
 RPC_DFS_SRC = ''' ../librpc/gen_ndr/srv_dfs.c rpc_server/srv_dfs_nt.c'''
 
 RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c
-		  ../librpc/gen_ndr/srv_spoolss.c'''
+                  ../librpc/gen_ndr/srv_spoolss.c'''
 
 RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c
-		   ${LIB_EVENTLOG_SRC} ../librpc/gen_ndr/srv_eventlog.c'''
+                   ${LIB_EVENTLOG_SRC} ../librpc/gen_ndr/srv_eventlog.c'''
 
 RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c
                rpc_server/srv_pipe.c rpc_server/srv_lsa_hnd.c'''
@@ -418,7 +418,7 @@ RPC_SERVER_SRC = '''${RPC_PIPE_SRC}'''
 RPC_PARSE_SRC = '''${RPC_PARSE_SRC2}'''
 
 RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c rpc_client/rpc_transport_np.c
-	rpc_client/rpc_transport_sock.c rpc_client/rpc_transport_smbd.c'''
+        rpc_client/rpc_transport_sock.c rpc_client/rpc_transport_smbd.c'''
 
 LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
 
@@ -436,17 +436,16 @@ passdb/pdb_smbpasswd.c passdb/secrets.c passdb/machine_sid.c'''
 #passdb/pdb_ldap.c passdb/pdb_nds.c'''
 
 PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
-		passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
-		passdb/util_unixsids.c passdb/lookup_sid.c
-		passdb/login_cache.c ${PDB_STATIC}
-		lib/account_pol.c ${PRIVILEGES_SRC} ${PASSDB_MODULES_SRC}
-		lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
+                passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
+                passdb/util_unixsids.c passdb/lookup_sid.c
+                passdb/login_cache.c ${PDB_STATIC}
+                lib/account_pol.c ${PRIVILEGES_SRC} ${PASSDB_MODULES_SRC}
+                lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
 #FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
 
 
 
-EXTRA_SRC = '''lib/tldap.c lib/tldap_util.c
-lib/util_tsock.c''' #lib/smbdlap.c lib/smbldap_util.c'''
+EXTRA_SRC = ''
 
 AUTH_SRC1 = '''${AUTH_BUILTIN_SRC} ${AUTH_DOMAIN_SRC} ${AUTH_SAM_SRC}
 ${AUTH_SERVER_SRC} ${AUTH_UNIX_SRC} ${AUTH_WINBIND_SRC}
@@ -461,13 +460,13 @@ GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
 
 PROFILE_SRC = '''profile/profile.c'''
 PROFILES_SRC = '''utils/profiles.c
-	       ${LIBSMB_ERR_SRC}
-	       ${PARAM_SRC}
+               ${LIBSMB_ERR_SRC}
+               ${PARAM_SRC}
                ${LIB_SRC} ${LIB_DUMMY_SRC}
                ${POPT_LIB_SRC}'''
 
 OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
-	     smbd/oplock_onefs.c'''
+             smbd/oplock_onefs.c'''
 
 NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
 
@@ -514,8 +513,8 @@ VFS_ACL_XATTR_SRC = 'modules/vfs_acl_xattr.c'
 VFS_ACL_TDB_SRC = 'modules/vfs_acl_tdb.c'
 VFS_SMB_TRAFFIC_ANALYZER_SRC = 'modules/vfs_smb_traffic_analyzer.c'
 VFS_ONEFS_SRC = '''modules/vfs_onefs.c modules/onefs_acl.c modules/onefs_system.c
-		modules/onefs_open.c modules/onefs_streams.c modules/onefs_dir.c
-		modules/onefs_cbrl.c modules/onefs_notify.c modules/onefs_config.c'''
+                modules/onefs_open.c modules/onefs_streams.c modules/onefs_dir.c
+                modules/onefs_cbrl.c modules/onefs_notify.c modules/onefs_config.c'''
 VFS_ONEFS_SHADOW_COPY_SRC = 'modules/vfs_onefs_shadow_copy.c modules/onefs_shadow_copy.c'
 PERFCOUNT_ONEFS_SRC = 'modules/perfcount_onefs.c'
 PERFCOUNT_TEST_SRC = 'modules/perfcount_test.c'
@@ -540,9 +539,127 @@ AUTH_SCRIPT_SRC = 'auth/auth_script.c'
 AUTH_NETLOGOND_SRC = 'auth/auth_netlogond.c'
 
 AUTH_SRC = '''${AUTH_SRC1} auth/auth.c ${AUTH_STATIC} auth/auth_util.c auth/token_util.c
-	   auth/auth_compat.c auth/auth_ntlmssp.c auth/user_info.c auth/check_samsec.c
+           auth/auth_compat.c auth/auth_ntlmssp.c auth/user_info.c auth/check_samsec.c
            auth/server_info.c auth/server_info_sam.c
-	   ${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
+           ${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
+
+#FIXME: set IDMAP_STATIC during configuration
+IDMAP_STATIC=''
+
+IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c ${IDMAP_STATIC}'
+
+#FIXME: set NSS_INFO_STATIC during configuration
+NSS_INFO_STATIC = ''
+NSS_INFO_SRC = 'winbindd/nss_info.c ${NSS_INFO_STATIC}'
+
+IDMAP_HASH_SRC = '''winbindd/idmap_hash/idmap_hash.c
+                    winbindd/idmap_hash/mapfile.c'''
+
+IDMAP_ADEX_SRC = '''winbindd/idmap_adex/idmap_adex.c
+                    winbindd/idmap_adex/cell_util.c
+                    winbindd/idmap_adex/likewise_cell.c
+                    winbindd/idmap_adex/provider_unified.c
+                    winbindd/idmap_adex/gc_util.c
+                    winbindd/idmap_adex/domain_util.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.c
+                   winbindd/winbindd_rpc.c
+                   winbindd/winbindd_reconnect.c
+                   winbindd/winbindd_ads.c
+                   winbindd/winbindd_passdb.c
+                   winbindd/winbindd_dual.c
+                   winbindd/winbindd_dual_ndr.c
+                   winbindd/winbindd_dual_srv.c
+                   librpc/gen_ndr/cli_wbint.c
+                   librpc/gen_ndr/srv_wbint.c
+                   librpc/gen_ndr/ndr_wbint.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_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_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_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_set_mapping.c
+                   winbindd/winbindd_remove_mapping.c
+                   winbindd/winbindd_set_hwm.c
+                   auth/token_util.c
+                   auth/check_samsec.c
+                   auth/server_info.c
+                   auth/server_info_sam.c
+                   auth/user_info.c
+                   ../nsswitch/libwbclient/wb_reqtrans.c'''
+
+WINBINDD_SRC = '''${WINBINDD_SRC1}
+                  ${PARAM_SRC} ${LIB_NONSMBD_SRC}
+                  ${LIBSMB_SRC} ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC} ${RPC_PARSE_SRC}
+                  ${PROFILE_SRC} ${SLCACHE_SRC} ${SMBLDAP_SRC}
+                  ${LIBADS_SRC} ${KRBCLIENT_SRC} ${POPT_LIB_SRC}
+                  ${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
+                  ${AFS_SRC} ${AFS_SETTOKEN_SRC}
+                  ${LIBADS_SERVER_SRC} ${LDB_SRC}
+                  ${TDB_VALIDATE_SRC}'''
 
 LDB_COMMON_SRC = '''lib/ldb/common/ldb.c lib/ldb/common/ldb_ldif.c lib/ldb/common/ldb_parse.c
                     lib/ldb/common/ldb_msg.c lib/ldb/common/ldb_utf8.c lib/ldb/common/ldb_debug.c
@@ -586,66 +703,66 @@ SMBD_SRC_MAIN = '''smbd/server.c'''
 BUILDOPT_SRC = '''smbd/build_options.c'''
 
 SMBD_SRC_SRV = '''smbd/files.c smbd/chgpasswd.c smbd/connection.c
-	       smbd/utmp.c smbd/session.c smbd/map_username.c
+               smbd/utmp.c smbd/session.c smbd/map_username.c
                smbd/dfree.c smbd/dir.c smbd/password.c smbd/conn.c
-	       smbd/share_access.c smbd/fileio.c
+               smbd/share_access.c smbd/fileio.c
                smbd/ipc.c smbd/lanman.c smbd/negprot.c
                smbd/message.c smbd/nttrans.c smbd/pipes.c
                smbd/reply.c smbd/sesssetup.c smbd/trans2.c smbd/uid.c
-	       smbd/dosmode.c smbd/filename.c smbd/open.c smbd/close.c
-	       smbd/blocking.c smbd/sec_ctx.c smbd/srvstr.c
-	       smbd/vfs.c smbd/perfcount.c smbd/statcache.c smbd/seal.c
+               smbd/dosmode.c smbd/filename.c smbd/open.c smbd/close.c
+               smbd/blocking.c smbd/sec_ctx.c smbd/srvstr.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/printfsp.c lib/sysquotas.c lib/sysquotas_linux.c
-	       lib/sysquotas_xfs.c lib/sysquotas_4A.c
-	       smbd/change_trust_pw.c smbd/fake_file.c
-	       smbd/quotas.c smbd/ntquotas.c ${AFS_SRC} smbd/msdfs.c
-	       ${AFS_SETTOKEN_SRC} smbd/aio.c smbd/statvfs.c
-	       smbd/dmapi.c smbd/signing.c
-	       smbd/file_access.c
-	       smbd/dnsregister.c smbd/globals.c
-	       smbd/smb2_server.c
-	       smbd/smb2_signing.c
-	       smbd/smb2_glue.c
-	       smbd/smb2_negprot.c
-	       smbd/smb2_sesssetup.c
-	       smbd/smb2_tcon.c
-	       smbd/smb2_create.c
-	       smbd/smb2_close.c
-	       smbd/smb2_flush.c
-	       smbd/smb2_read.c
-	       smbd/smb2_write.c
-	       smbd/smb2_lock.c
-	       smbd/smb2_ioctl.c
-	       smbd/smb2_keepalive.c
-	       smbd/smb2_find.c
-	       smbd/smb2_notify.c
-	       smbd/smb2_getinfo.c
-	       smbd/smb2_setinfo.c
-	       smbd/smb2_break.c
+               smbd/process.c smbd/service.c smbd/error.c
+               printing/printfsp.c lib/sysquotas.c lib/sysquotas_linux.c
+               lib/sysquotas_xfs.c lib/sysquotas_4A.c
+               smbd/change_trust_pw.c smbd/fake_file.c
+               smbd/quotas.c smbd/ntquotas.c ${AFS_SRC} smbd/msdfs.c
+               ${AFS_SETTOKEN_SRC} smbd/aio.c smbd/statvfs.c
+               smbd/dmapi.c smbd/signing.c
+               smbd/file_access.c
+               smbd/dnsregister.c smbd/globals.c
+               smbd/smb2_server.c
+               smbd/smb2_signing.c
+               smbd/smb2_glue.c
+               smbd/smb2_negprot.c
+               smbd/smb2_sesssetup.c
+               smbd/smb2_tcon.c
+               smbd/smb2_create.c
+               smbd/smb2_close.c
+               smbd/smb2_flush.c
+               smbd/smb2_read.c
+               smbd/smb2_write.c
+               smbd/smb2_lock.c
+               smbd/smb2_ioctl.c
+               smbd/smb2_keepalive.c
+               smbd/smb2_find.c
+               smbd/smb2_notify.c
+               smbd/smb2_getinfo.c
+               smbd/smb2_setinfo.c
+               smbd/smb2_break.c
                ../libcli/smb/smb2_create_blob.c
                ${MANGLE_SRC} ${VFS_DEFAULT_SRC}'''
 
 SMBD_SRC_BASE = '''${PARAM_WITHOUT_REG_SRC} ${SMBD_SRC_SRV}
-		${LIBSMB_SRC} ${RPC_SERVER_SRC} ${RPC_PARSE_SRC}
-		${LOCKING_SRC} ${PASSDB_SRC} ${PRINTING_SRC}
-		${PROFILE_SRC} ${LIB_SRC} ${PRINTBACKEND_SRC}
-		${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
-		${GROUPDB_SRC} ${LIBMSRPC_SRC}
-		${LIBMSRPC_GEN_SRC} ${AVAHI_SRC} ${LIBADS_SRC}
-		${KRBCLIENT_SRC} ${LIBADS_SERVER_SRC} ${REG_FULL_SRC}
-		${POPT_LIB_SRC} ${BUILDOPT_SRC} ${SMBLDAP_SRC}
-		${LDB_SRC} ${LIBNET_SRC} ${LIBSMBCONF_SRC}
-		${WBCOMMON_SRC} ${RPC_LSA_SRC}
-		${RPC_NETLOG_SRC} ${RPC_SAMR_SRC}
-		${RPC_INITSHUTDOWN_SRC} ${RPC_REG_SRC}
-		${RPC_DSSETUP_SRC} ${RPC_SVC_SRC} ${RPC_WKS_SRC}
-		${RPC_SVCCTL_SRC} ${RPC_NTSVCS_SRC} ${RPC_DFS_SRC}
-		${RPC_SPOOLSS_SRC} ${RPC_EVENTLOG_SRC}
-		${RPC_ECHO_SRC}
-		${EXTRA_SRC} ${AUTH_SRC}
-		${PRIVILEGES_BASIC_SRC}'''
+                ${LIBSMB_SRC} ${RPC_SERVER_SRC} ${RPC_PARSE_SRC}
+                ${LOCKING_SRC} ${PRINTING_SRC}
+                ${PROFILE_SRC} ${LIB_SRC} ${PRINTBACKEND_SRC}
+                ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
+                ${LIBMSRPC_SRC}
+                ${LIBMSRPC_GEN_SRC} ${AVAHI_SRC} ${LIBADS_SRC}
+                ${KRBCLIENT_SRC} ${LIBADS_SERVER_SRC} ${REG_FULL_SRC}
+                ${POPT_LIB_SRC} ${BUILDOPT_SRC} ${SMBLDAP_SRC}
+                ${LDB_SRC} ${LIBNET_SRC} ${LIBSMBCONF_SRC}
+                ${RPC_LSA_SRC}
+                ${RPC_NETLOG_SRC} ${RPC_SAMR_SRC}
+                ${RPC_INITSHUTDOWN_SRC} ${RPC_REG_SRC}
+                ${RPC_DSSETUP_SRC} ${RPC_SVC_SRC} ${RPC_WKS_SRC}
+                ${RPC_SVCCTL_SRC} ${RPC_NTSVCS_SRC} ${RPC_DFS_SRC}
+                ${RPC_SPOOLSS_SRC} ${RPC_EVENTLOG_SRC}
+                ${RPC_ECHO_SRC}
+                ${AUTH_SRC}
+                ${PRIVILEGES_BASIC_SRC}'''
 
 PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_cups.c printing/print_generic.c
@@ -671,12 +788,15 @@ NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
             nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c'''
 
 NMBD_SRC = '''${NMBD_SRC1} ${PARAM_SRC} ${LIBSMB_SRC} ${LDB_SRC} ${KRBCLIENT_SRC}
-           ${PROFILE_SRC} ${LIB_NONSMBD_SRC} ${POPT_LIB_SRC} ${GROUPDB_SRC}
-	   ${LIBNDR_GEN_SRC0} ${WBCOMMON_SRC} ${PASSDB_SRC} ${TLDAP_SRC}'''
+           ${PROFILE_SRC} ${LIB_NONSMBD_SRC} ${POPT_LIB_SRC}
+           ${LIBNDR_GEN_SRC0}'''
 
 WBINFO_SRC = '''../nsswitch/wbinfo.c ${LIBSAMBA_SRC} ${PARAM_SRC} ${LIB_NONSMBD_SRC}
-		${POPT_LIB_SRC} ${AFS_SETTOKEN_SRC} ${PASSDB_SRC} ${TLDAP_SRC}
-		${WBCOMMON_SRC} ${GROUPDB_SRC}'''
+                ${POPT_LIB_SRC} ${AFS_SETTOKEN_SRC}'''
+
+TESTPARM_SRC = '''utils/testparm.c
+               ${PARAM_SRC} ${LIB_NONSMBD_SRC} ${POPT_LIB_SRC}
+               ${LIBSMB_ERR_SRC}'''
 
 LIBS='ICONV'
 
@@ -704,6 +824,11 @@ bld.RECURSE('build')
 
 bld.SAMBA_MKVERSION('include/version.h')
 
+######################## SUBSYSTEMS #################################
+
+bld.SAMBA_SUBSYSTEM('WBCOMMON',
+                    source=WBCOMMON_SRC)
+
 bld.SAMBA_SUBSYSTEM('LIBWBCLIENT',
                     source='''../nsswitch/libwbclient/wbc_guid.c
                               ../nsswitch/libwbclient/wbc_idmap.c
@@ -712,7 +837,7 @@ bld.SAMBA_SUBSYSTEM('LIBWBCLIENT',
                               ../nsswitch/libwbclient/wbc_pwd.c
                               ../nsswitch/libwbclient/wbc_sid.c
                               ../nsswitch/libwbclient/wbc_util.c''',
-                    public_deps='talloc')
+                    public_deps='talloc WBCOMMON')
 
 bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     source='../lib/util/asn1.c',
@@ -720,27 +845,57 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     includes='../lib/tdb/include',
                     local_include=False)
 
+bld.SAMBA_SUBSYSTEM('GROUPDB',
+                    source=GROUPDB_SRC,
+                    deps='tdb')
+
+bld.SAMBA_SUBSYSTEM('TLDAP',
+                    source=TLDAP_SRC,
+                    deps='tdb')
+
+bld.SAMBA_SUBSYSTEM('PASSDB',
+                    source=PASSDB_SRC,
+                    deps='GROUPDB TLDAP',
+                    vars=locals())
+
+########################## BINARIES #################################
+
 bld.SAMBA_BINARY('smbd/smbd',
                  source=SMBD_SRC,
                  deps='''tdb DYNCONFIG tevent popt dl krb5 ldap gssapi gssapi_krb5
-                 NSS_WRAPPER LIBWBCLIENT crypt nsl cups cap resolv z''',
+                 NSS_WRAPPER LIBWBCLIENT crypt nsl cups cap resolv z PASSDB''',
                  includes='lib',
                  vars=locals())
 
 bld.SAMBA_BINARY('nmbd/nmbd',
                  source=NMBD_SRC,
                  deps='''talloc tdb tevent z cap resolv LIBWBCLIENT popt dl
-                 NSS_WRAPPER DYNCONFIG''',
+                 NSS_WRAPPER DYNCONFIG PASSDB''',
                  includes='lib ../lib/tdb/include',
                  vars=locals())
 
+bld.SAMBA_BINARY('winbindd/winbindd',
+                 source=WINBINDD_SRC,
+                 deps='''talloc tdb tevent cap dl popt DYNCONFIG z NSS_WRAPPER
+                 LIBWBCLIENT PASSDB resolv''',
+                 includes='lib',
+                 vars=locals())
+
 bld.SAMBA_BINARY('../nsswitch/wbinfo',
                  source=WBINFO_SRC,
                  deps='''talloc LIBWBCLIENT popt DYNCONFIG tevent tdb cap
-                 NSS_WRAPPER ASN1_UTIL LIBTSOCKET''',
+                 NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB''',
                  includes='lib ../lib/tdb/include',
                  vars=locals())
 
+bld.SAMBA_BINARY('utils/testparm',
+                 source=TESTPARM_SRC,
+                 deps='''talloc tdb tevent popt DYNCONFIG cap NSS_WRAPPER
+                 LIBWBCLIENT ASN1_UTIL LIBTSOCKET PASSDB''',
+                 vars=locals())
+
+########################## INCLLUDES #################################
+
 bld.RECURSE('../lib/socket_wrapper')
 bld.RECURSE('../lib/talloc')
 bld.RECURSE('../lib/tdb')