s3-waf: fix the build after libcli/security changes.
[samba.git] / source3 / wscript_build
index 7e233d22b2682f75dfa881c7635fa41923777db6..168edb3f0e30f30af5021f4ac64ee13fd6ccab40 100644 (file)
@@ -51,8 +51,7 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
              ../librpc/ndr/uuid.c
              librpc/ndr/util.c'''
 
-LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
-                  ../librpc/gen_ndr/ndr_lsa.c'''
+LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c'''
 
 LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c
                   ../librpc/ndr/ndr_netlogon.c'''
@@ -63,15 +62,6 @@ LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
 LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
                   ../librpc/ndr/ndr_spoolss_buf.c'''
 
-LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
-                           ../librpc/ndr/ndr_ntprinting.c'''
-
-LIBNDR_PREG_SRC = '''librpc/gen_ndr/ndr_preg.c
-                     librpc/ndr/ndr_preg.c'''
-
-LIBNDR_XATTR_SRC = '''../librpc/gen_ndr/ndr_xattr.c
-                  ../librpc/ndr/ndr_xattr.c'''
-
 LIBCLI_SPOOLSS_SRC = '''
                      ../librpc/gen_ndr/cli_spoolss.c
                      ../librpc/gen_ndr/ndr_spoolss_c.c
@@ -82,10 +72,6 @@ LIBCLI_EVENTLOG_SRC = '''
                       ../librpc/gen_ndr/cli_eventlog.c
                       ../librpc/gen_ndr/ndr_eventlog_c.c'''
 
-LIBCLI_WINREG_SRC = '''
-                    ../librpc/gen_ndr/cli_winreg.c
-                    ../librpc/gen_ndr/ndr_winreg_c.c'''
-
 LIBCLI_NTSVCS_SRC = '''
                     ../librpc/gen_ndr/cli_ntsvcs.c
                     ../librpc/gen_ndr/ndr_ntsvcs_c.c'''
@@ -98,10 +84,6 @@ LIBCLI_DFS_SRC = '''
                  ../librpc/gen_ndr/cli_dfs.c
                  ../librpc/gen_ndr/ndr_dfs_c.c'''
 
-LIBCLI_ECHO_SRC = '''
-                  ../librpc/gen_ndr/cli_echo.c
-                  ../librpc/gen_ndr/ndr_echo_c.c'''
-
 LIBCLI_INITSHUTDOWN_SRC = '''
                           ../librpc/gen_ndr/cli_initshutdown.c
                           ../librpc/gen_ndr/ndr_initshutdown_c.c'''
@@ -145,11 +127,9 @@ LIBCLI_EPMAPPER_SRC = '''
 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_NETLOGON_SRC}
                  ../librpc/gen_ndr/ndr_dssetup.c
                  ../librpc/gen_ndr/ndr_epmapper.c
@@ -162,13 +142,7 @@ REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 
 LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
 
-SOCKET_WRAPPER_SRC = '''${SOCKET_WRAPPER_SRCS}'''
-NSS_WRAPPER_SRC = '''${NSS_WRAPPER_SRCS}'''
-
-LIBSAMBAUTIL_SRC = '''
-                ${LIBREPLACE_SRC}
-                ${SOCKET_WRAPPER_SRC}
-                ${NSS_WRAPPER_SRC}'''
+LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
 
 UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
                    ../lib/util/xfile.c ../lib/util/util_strlist.c
@@ -179,7 +153,8 @@ UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.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/blocking.c ../lib/util/rfc1738.c
+                   ../lib/util/select.c'''
 
 LIBTEVENT_SRC0 = ''
 
@@ -187,14 +162,10 @@ PTHREADPOOL_SRC = ''
 
 LIBREPLACE_SRCS = ''
 
-SOCKET_WRAPPER_SRCS = ''
-
-NSS_WRAPPER_SRCS = ''
-
 ZLIB_SRCS = ''
 
 LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
-          lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
+          lib/messages.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
@@ -215,7 +186,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
           lib/util.c lib/util_names.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/ms_fnmatch.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
@@ -223,20 +194,21 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
           lib/sessionid_tdb.c
           lib/module.c lib/events.c ${LIBTEVENT_SRC0}
           lib/server_contexts.c
-          lib/ldap_escape.c ${CHARSET_STATIC}
-          lib/secdesc.c lib/util_seaccess.c ../libcli/security/secace.c
+          lib/ldap_escape.c
+          lib/secdesc.c ../libcli/security/access_check.c
+          ../libcli/security/secace.c
+          ../libcli/security/object_tree.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
           lib/file_id.c lib/idmap_cache.c
-          ../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c'''
+          ../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c
+          ../libcli/security/security_token.c ../libcli/security/util_sid.c'''
 
 LIB_DUMMY_SRC = '''lib/dummysmbd.c lib/dummyroot.c'''
 LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}'''
 
-READLINE_SRC = '''lib/readline.c'''
-
 POPT_LIB_SRC = '''lib/popt_common.c'''
 
 PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
@@ -248,19 +220,11 @@ 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_SRC = '''${LIBADDNS_SRC0} ${SOCKET_WRAPPER_SRC}'''
-
-GPEXT_STATIC = ''
-GPEXT_REGISTRY_SRC = 'libgpo/gpext/registry.c'
-GPEXT_SCRIPTS_SRC = 'libgpo/gpext/scripts.c'
-GPEXT_SECURITY_SRC = 'libgpo/gpext/security.c'
-
-GPEXT_SRC = '''../libgpo/gpext/gpext.c ${GPEXT_STATIC}'''
+LIBADDNS_SRC = '''${LIBADDNS_SRC0}'''
 
 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_reg.c'''
 LIBGPO_SRC = '''${LIBGPO_SRC0}'''
 
 LIBADS_SRC = '''libads/ldap.c
@@ -272,14 +236,12 @@ LIBADS_SRC = '''libads/ldap.c
              libads/disp_sec.c libads/ldap_utils.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'''
+LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c'''
 
 LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
 
 SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
-                 passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.c'''
+                 passdb/machine_sid.c'''
 
 LIBNBT_SRC = '''../libcli/nbt/nbtname.c
              ../libcli/netlogon.c
@@ -320,8 +282,7 @@ LIBCLI_LDAP_NDR_SRC = '''../libcli/ldap/ldap_ndr.c lib/ldb_compat.c'''
 
 CLDAP_SRC = '''libads/cldap.c
         ../libcli/cldap/cldap.c
-        ../lib/util/idtree.c
-        ${LIBCLI_LDAP_MESSAGE_SRC} ${LIBCLI_LDAP_NDR_SRC}'''
+        ../lib/util/idtree.c'''
 
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
@@ -341,7 +302,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/smb_seal.c libsmb/async_smb.c
              ${LIBNMB_SRC}
              ${LIBNBT_SRC}
-             ${CLDAP_SRC}
              ${DRSUAPI_SRC}'''
 
 LIBMSRPC_SRC = '''
@@ -407,8 +367,14 @@ 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_perfcount.c'''
+
+SERVICES_SRC = '''services/svc_spoolss.c
+                  services/svc_rcinit.c
+                  services/services_db.c
+                  services/svc_netlogon.c
+                  services/svc_winreg.c
+                  services/svc_wins.c'''
 
 LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
 
@@ -439,10 +405,7 @@ RPC_WKSSVC_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
-                  services/svc_spoolss.c services/svc_rcinit.c services/services_db.c
-                  services/svc_netlogon.c services/svc_winreg.c
-                  services/svc_wins.c'''
+                  ../librpc/gen_ndr/srv_svcctl.c'''
 
 RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c
                  ../librpc/gen_ndr/srv_ntsvcs.c'''
@@ -455,7 +418,7 @@ RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.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'''
+                   ../librpc/gen_ndr/srv_eventlog.c'''
 
 NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
                      ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
@@ -486,32 +449,18 @@ PRIVILEGES_SRC = '''lib/privileges.c'''
 
 PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 
-PDB_STATIC =        ''
-PDB_TDBSAM_SRC =    'passdb/pdb_tdb.c'
-PDB_LDAP_SRC =      'passdb/pdb_ldap.c passdb/pdb_nds.c'
-PDB_ADS_SRC =       'passdb/pdb_ads.c'
-PDB_SMBPASSWD_SRC = 'passdb/pdb_smbpasswd.c'
-PDB_WBC_SAM_SRC =   'passdb/pdb_wbc_sam.c'
-
-PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
+PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
                 passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
                 passdb/util_unixsids.c passdb/lookup_sid.c
-                passdb/login_cache.c ${PDB_STATIC}
+                passdb/login_cache.c
                 passdb/account_pol.c ${PRIVILEGES_SRC}
                 lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
 #FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
 
-CHARSET_STATIC = ''
-CHARSET_WEIRD_SRC = 'modules/weird.c'
-CHARSET_CP850_SRC = 'modules/CP850.c'
-CHARSET_CP437_SRC = 'modules/CP437.c'
-CHARSET_MACOSXFS_SRC = 'modules/charset_macosxfs.c'
-
 GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
 
 PROFILE_SRC = '''profile/profile.c'''
-PROFILES_SRC = '''utils/profiles.c
-               ${REGFIO_SRC}'''
+PROFILES_SRC = '''utils/profiles.c'''
 
 OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
              smbd/oplock_onefs.c'''
@@ -521,55 +470,6 @@ NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
 
 FNAME_UTIL_SRC = '''smbd/filename_util.c'''
 
-VFS_STATIC = ''
-VFS_DEFAULT_SRC = '''modules/vfs_default.c'''
-VFS_AUDIT_SRC = '''modules/vfs_audit.c'''
-VFS_EXTD_AUDIT_SRC = '''modules/vfs_extd_audit.c'''
-VFS_FULL_AUDIT_SRC = '''modules/vfs_full_audit.c'''
-VFS_FAKE_PERMS_SRC = '''modules/vfs_fake_perms.c'''
-VFS_RECYCLE_SRC = '''modules/vfs_recycle.c'''
-VFS_NETATALK_SRC = '''modules/vfs_netatalk.c'''
-VFS_DEFAULT_QUOTA_SRC = '''modules/vfs_default_quota.c'''
-VFS_READONLY_SRC = '''modules/vfs_readonly.c modules/getdate.c'''
-VFS_CAP_SRC = '''modules/vfs_cap.c'''
-VFS_EXPAND_MSDFS_SRC = '''modules/vfs_expand_msdfs.c'''
-VFS_SHADOW_COPY_SRC = '''modules/vfs_shadow_copy.c'''
-VFS_SHADOW_COPY2_SRC = '''modules/vfs_shadow_copy2.c'''
-VFS_AFSACL_SRC = '''modules/vfs_afsacl.c'''
-VFS_XATTR_TDB_SRC = '''modules/vfs_xattr_tdb.c'''
-VFS_POSIXACL_SRC = '''modules/vfs_posixacl.c'''
-VFS_AIXACL_SRC = '''modules/vfs_aixacl.c modules/vfs_aixacl_util.c'''
-VFS_AIXACL2_SRC = '''modules/vfs_aixacl2.c modules/vfs_aixacl_util.c modules/nfs4_acls.c'''
-VFS_SOLARISACL_SRC = '''modules/vfs_solarisacl.c'''
-VFS_ZFSACL_SRC = '''modules/vfs_zfsacl.c modules/nfs4_acls.c'''
-VFS_HPUXACL_SRC = '''modules/vfs_hpuxacl.c'''
-VFS_IRIXACL_SRC = '''modules/vfs_irixacl.c'''
-VFS_TRU64ACL_SRC = '''modules/vfs_tru64acl.c'''
-VFS_CATIA_SRC = 'modules/vfs_catia.c'
-VFS_STREAMS_XATTR_SRC = 'modules/vfs_streams_xattr.c'
-VFS_STREAMS_DEPOT_SRC = 'modules/vfs_streams_depot.c'
-VFS_CACHEPRIME_SRC = 'modules/vfs_cacheprime.c'
-VFS_PREALLOC_SRC = 'modules/vfs_prealloc.c'
-VFS_COMMIT_SRC = 'modules/vfs_commit.c'
-VFS_GPFS_SRC = 'modules/vfs_gpfs.c modules/gpfs.c modules/nfs4_acls.c'
-VFS_NOTIFY_FAM_SRC = 'modules/vfs_notify_fam.c'
-VFS_READAHEAD_SRC = 'modules/vfs_readahead.c'
-VFS_TSMSM_SRC = 'modules/vfs_tsmsm.c'
-VFS_FILEID_SRC = 'modules/vfs_fileid.c'
-VFS_AIO_FORK_SRC = 'modules/vfs_aio_fork.c'
-VFS_PREOPEN_SRC = 'modules/vfs_preopen.c'
-VFS_SYNCOPS_SRC = 'modules/vfs_syncops.c'
-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'''
-VFS_ONEFS_SHADOW_COPY_SRC = 'modules/vfs_onefs_shadow_copy.c modules/onefs_shadow_copy.c'
-VFS_DIRSORT_SRC = 'modules/vfs_dirsort.c'
-VFS_SCANNEDONLY_SRC = 'modules/vfs_scannedonly.c'
-VFS_CROSSRENAME_SRC = 'modules/vfs_crossrename.c'
-VFS_LINUX_XFS_SGID_SRC = 'modules/vfs_linux_xfs_sgid.c'
 
 PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
 
@@ -577,50 +477,6 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
 
 DCUTIL_SRC  = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c'''
 
-AUTH_BUILTIN_SRC = 'auth/auth_builtin.c'
-AUTH_DOMAIN_SRC = 'auth/auth_domain.c'
-AUTH_SAM_SRC = 'auth/auth_sam.c auth/check_samsec.c'
-AUTH_SERVER_SRC = 'auth/auth_server.c'
-AUTH_UNIX_SRC = 'auth/auth_unix.c'
-AUTH_WINBIND_SRC = 'auth/auth_winbind.c'
-AUTH_WBC_SRC = 'auth/auth_wbc.c'
-AUTH_SCRIPT_SRC = 'auth/auth_script.c'
-AUTH_NETLOGOND_SRC = 'auth/auth_netlogond.c'
-
-AUTH_STATIC = ''
-AUTH_SRC = '''${AUTH_STATIC} auth/auth.c auth/auth_util.c auth/token_util.c
-           auth/server_info.c
-           auth/server_info_sam.c
-           auth/user_info.c
-           auth/user_util.c
-           auth/user_krb5.c
-           auth/auth_compat.c auth/auth_ntlmssp.c
-           ${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
-
-#FIXME: set IDMAP_STATIC during configuration
-IDMAP_STATIC=''
-IDMAP_RW_SRC = 'winbindd/idmap_rw.c'
-IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c ${IDMAP_RW_SRC} ${IDMAP_STATIC}'
-
-#FIXME: set NSS_INFO_STATIC during configuration
-NSS_INFO_STATIC = ''
-NSS_INFO_TEMPLATE_SRC = 'winbindd/nss_info_template.c'
-NSS_INFO_SRC = 'winbindd/nss_info.c'
-
-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'''
-
-PERFCOUNT_STATIC = ''
-PERFCOUNT_ONEFS_SRC = 'modules/perfcount_onefs.c'
-PERFCOUNT_TEST_SRC = 'modules/perfcount_test.c'
-
 WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_group.c
                    winbindd/winbindd_util.c
@@ -637,10 +493,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.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
-                   librpc/gen_ndr/ndr_wbint_c.c
                    winbindd/winbindd_async.c
                    winbindd/winbindd_creds.c
                    winbindd/winbindd_cred_cache.c
@@ -719,9 +571,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    ../nsswitch/libwbclient/wb_reqtrans.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
-                  ${PROFILE_SRC} ${SLCACHE_SRC}
-                  ${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
-                  ${AFS_SRC} ${AFS_SETTOKEN_SRC}
                   ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
                   ${TDB_VALIDATE_SRC}
                   ${LIBCLI_DSSETUP_SRC}
@@ -753,8 +602,8 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                lib/sysquotas_xfs.c lib/sysquotas_4A.c
                lib/sysquotas_nfs.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/quotas.c smbd/ntquotas.c smbd/msdfs.c
+               smbd/aio.c smbd/statvfs.c
                smbd/dmapi.c smbd/signing.c
                smbd/file_access.c
                smbd/dnsregister.c smbd/globals.c
@@ -782,14 +631,11 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
 
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${RPC_SERVER_SRC}
-                ${PRINTING_SRC}
-                ${PROFILE_SRC} ${PRINTBACKEND_SRC}
                 ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
                 ${REG_FULL_SRC}
                 ${BUILDOPT_SRC}
-                ${LIBNET_SRC} ${LIBSMBCONF_SRC}
+                ${LIBSMBCONF_SRC}
                 ${LIBCLI_SPOOLSS_SRC}
-                ${LIBCLI_WINREG_SRC}
                 ${LIBCLI_SRVSVC_SRC}
                 ${LIBCLI_LSA_SRC}
                 ${LIBCLI_SAMR_SRC}
@@ -797,10 +643,7 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${RPC_CLIENT_SCHANNEL_SRC}
                 rpc_client/init_netlogon.c
                 rpc_client/init_samr.c
-                ${PRIVILEGES_BASIC_SRC}
-                ${REGFIO_SRC}
-                ${REG_API_REGF_SRC}
-                ${LIBNDR_XATTR_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
@@ -812,9 +655,7 @@ PRINTBACKEND_SRC = '''printing/printing.c
                       printing/nt_printing.c
                       printing/nt_printing_tdb.c
                       printing/nt_printing_migrate.c
-                      printing/nt_printing_ads.c
-                      ${LIBNDR_NTPRINTING_SRC}
-                      ${PRINTBASE_SRC}'''
+                      printing/nt_printing_ads.c'''
 
 SMBD_SRC = '''${SMBD_SRC_BASE} ${SMBD_SRC_MAIN}'''
 
@@ -831,25 +672,22 @@ NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.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} ${PROFILE_SRC}'
+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} ${PRINTING_SRC} ${PRINTBASE_SRC}
-           ${PLAINTEXT_AUTH_SRC}
+SWAT_SRC = '''${SWAT_SRC1}
            ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
            ${LIBCLI_SAMR_SRC}
            rpc_client/init_lsa.c'''
 
 STATUS_SRC = '''utils/status.c utils/status_profile.c
-             ${PROFILE_SRC}
              ${FNAME_UTIL_SRC}'''
 
-SMBCONTROL_SRC = '''utils/smbcontrol.c ${PRINTBASE_SRC}'''
+SMBCONTROL_SRC = '''utils/smbcontrol.c'''
 
 SMBTREE_SRC = '''utils/smbtree.c
-             ${PROFILE_SRC}
              ${LIBCLI_SRVSVC_SRC}'''
 
 TESTPARM_SRC = 'utils/testparm.c'
@@ -860,12 +698,11 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
 
 PASSWD_UTIL_SRC = 'utils/passwd_util.c'
 
-SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSWD_UTIL_SRC} ${PASSCHANGE_SRC}
+SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}
                 ${LIBCLI_SAMR_SRC}
                 rpc_client/init_lsa.c'''
 
-PDBEDIT_SRC = '''utils/pdbedit.c ${PASSWD_UTIL_SRC}
-                ${LIBCLI_LDAP_NDR_SRC}'''
+PDBEDIT_SRC = '''utils/pdbedit.c'''
 
 SMBGET_SRC = '''utils/smbget.c'''
 
@@ -879,24 +716,19 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.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
-                    ${DISPLAY_SEC_SRC}'''
+                    rpcclient/cmd_winreg.c'''
 
 RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
-                   ${READLINE_SRC}
-                   ${DCUTIL_SRC}
                    ${LIBCLI_SPOOLSS_SRC}
                    ${LIBCLI_EVENTLOG_SRC}
                    ${LIBCLI_NTSVCS_SRC}
                    ${LIBCLI_DRSUAPI_SRC}
                    ${LIBCLI_DFS_SRC}
-                   ${LIBCLI_ECHO_SRC}
                    ${LIBCLI_DSSETUP_SRC}
                    ${LIBCLI_WKSSVC_SRC}
                    ${LIBCLI_SRVSVC_SRC}
                    ${LIBCLI_LSA_SRC}
                    ${LIBCLI_SAMR_SRC}
-                   ${LIBCLI_WINREG_SRC}
                    ${LIBCLI_NETLOGON_SRC}
                    ${RPC_CLIENT_SCHANNEL_SRC}
                    rpc_client/init_netlogon.c
@@ -932,7 +764,6 @@ LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
 
 LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
                     lib/netapi/cm.c
-                    librpc/gen_ndr/ndr_libnetapi.c
                     lib/netapi/libnetapi.c
                     lib/netapi/joindomain.c
                     lib/netapi/serverinfo.c
@@ -947,10 +778,10 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
                     lib/netapi/shutdown.c
                     lib/netapi/netlogon.c'''
 
-LIBNETAPI_SRC = '''${LIBNETAPI_SRC0} ${LIBNET_SRC}
+LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
                    ${LIBSMBCONF_SRC}
                    ${REG_SMBCONF_SRC}
-                   ${DCUTIL_SRC} ${PRIVILEGES_BASIC_SRC}
+                   ${PRIVILEGES_BASIC_SRC}
                    auth/token_util.c
                    ${LIBCLI_INITSHUTDOWN_SRC}
                    ${LIBCLI_WKSSVC_SRC}
@@ -968,7 +799,6 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c
                  client/dnsbrowse.c'''
 
 CLIENT_SRC = '''${CLIENT_SRC1}
-                ${READLINE_SRC} ${DISPLAY_SEC_SRC}
                 ${LIBCLI_SRVSVC_SRC}
                 rpc_client/init_lsa.c'''
 
@@ -980,7 +810,7 @@ SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
 
 SMBCONFTORT_SRC = '''${SMBCONFTORT_SRC0}'''
 
-LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c librpc/gen_ndr/ndr_libnet_join.c'
+LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c'
 
 
 LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
@@ -1002,7 +832,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.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
-              ${PASSWD_UTIL_SRC} utils/net_dns.c utils/net_ads_gpo.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
               auth/token_util.c utils/net_dom.c utils/net_share.c
@@ -1010,10 +840,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_serverid.c
               utils/net_eventlog.c
               utils/net_printing.c
-              ${LIBNDR_NTPRINTING_SRC}
-              ${LIBNDR_PREG_SRC}
               ${LIBCLI_SPOOLSS_SRC}
-              ${LIBCLI_WINREG_SRC}
               ${LIBCLI_DRSUAPI_SRC}
               ${LIBCLI_INITSHUTDOWN_SRC}
               ${LIBCLI_DSSETUP_SRC}
@@ -1033,12 +860,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
 NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
 
 NET_SRC = '''${NET_SRC1}
-             ${NET_SRC2}
-             ${DCUTIL_SRC}
-             ${AFS_SRC} ${AFS_SETTOKEN_SRC} ${READLINE_SRC}
-             ${LIBGPO_SRC} ${DISPLAY_SEC_SRC}
-             ${LIBNET_SRC} ${LIBNET_DSSYNC_SRC} ${LIBNET_SAMSYNC_SRC}
-             ${LIB_EVENTLOG_SRC} ${REGFIO_SRC}'''
+             ${NET_SRC2}'''
 
 CUPS_SRC = '''client/smbspool.c'''
 
@@ -1047,6 +869,7 @@ NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
 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_posix_append.c'''
 
 SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
@@ -1063,7 +886,7 @@ NSSTEST_SRC = '''torture/nsstest.c ${LIBSAMBAUTIL_SRC}'''
 
 PDBTEST_SRC = '''torture/pdbtest.c'''
 
-VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c ${READLINE_SRC}'''
+VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c'''
 
 SMBICONV_SRC = '''torture/smbiconv.c'''
 
@@ -1080,9 +903,7 @@ SMBCQUOTAS_SRC = '''utils/smbcquotas.c
 EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
 
 EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
-                registry/reg_eventlog.c ${LIB_EVENTLOG_SRC}
-                ../librpc/gen_ndr/ndr_eventlog.c
-                ../librpc/gen_ndr/ndr_lsa.c'''
+                registry/reg_eventlog.c'''
 
 SHARESEC_SRC0 = 'utils/sharesec.c'
 SHARESEC_SRC  = '''${SHARESEC_SRC0}'''
@@ -1094,13 +915,7 @@ SMBFILTER_SRC = '''utils/smbfilter.c'''
 WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
         ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
 
-PAM_SMBPASS_SRC_0 = '''pam_smbpass/pam_smb_auth.c pam_smbpass/pam_smb_passwd.c
-                pam_smbpass/pam_smb_acct.c pam_smbpass/support.c ../lib/util/asn1.c'''
-PAM_SMBPASS_SRC = '''${PAM_SMBPASS_SRC_0} ${PARAM_SRC} ${LIB_NONSMBD_SRC} ${PASSDB_SRC} ${GROUPDB_SRC} \
-                ${SMBLDAP_SRC} ${LIBSAMBA_SRC} \
-                ${LIBTSOCKET_SRC}'''
-
-WBINFO_SRC = '''../nsswitch/wbinfo.c ${AFS_SETTOKEN_SRC}'''
+WBINFO_SRC = '''../nsswitch/wbinfo.c'''
 
 WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
 
@@ -1116,7 +931,6 @@ NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
                 ../libcli/auth/spnego_parse.c libsmb/clikrb5.c libads/kerberos.c
                 libsmb/samlogon_cache.c
                 ${LIBNMB_SRC}
-                ${LIBCLI_LDAP_NDR_SRC}
                 ${LIBNDR_NETLOGON_SRC}'''
 
 
@@ -1136,7 +950,7 @@ SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
 LIBS='ICONV'
 
 bld.SAMBA_GENERATOR('build_options',
-                    source='include/config.h script/mkbuildoptions.awk',
+                    source='include/config.h script/mkbuildoptions-waf.awk',
                     target='smbd/build_options.c',
                     rule='${AWK} -f ${SRC[1].abspath(env)} > ${TGT} < ${SRC[0].abspath(env)}')
 
@@ -1152,6 +966,7 @@ t.env.BUILDDIR = bld.path.abspath()
 bld.SETUP_BUILD_GROUPS()
 
 bld.RECURSE('../lib/replace')
+bld.RECURSE('../libcli/smbreadline')
 print "SBINDIR=%s" % bld.env.SBINDIR
 bld.RECURSE('build')
 
@@ -1162,6 +977,16 @@ bld.RECURSE('librpc')
 bld.SAMBA_MKVERSION('include/version.h')
 
 for prefix in bld.env.MODULE_PREFIXES:
+
+    if prefix == 'auth': continue
+    if prefix == 'pdb': continue
+    if prefix == 'idmap': continue
+    if prefix == 'charset': continue
+    if prefix == 'perfcount': continue
+    if prefix == 'gpext': continue
+    if prefix == 'vfs': continue
+    if prefix == 'nss_info': continue
+
     static_key = "%s_STATIC" % prefix.upper()
     shared_key = "%s_SHARED" % prefix.upper()
 
@@ -1189,29 +1014,34 @@ bld.SAMBA_LIBRARY('libwbclient',
                               ../nsswitch/libwbclient/wbc_pwd.c
                               ../nsswitch/libwbclient/wbc_sid.c
                               ../nsswitch/libwbclient/wbc_util.c''',
+                    public_headers='../nsswitch/libwbclient/wbclient.h',
                     public_deps='talloc WBCOMMON')
 
 bld.SAMBA_LIBRARY('libnetapi',
                     source=LIBNETAPI_SRC,
                     public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
                     PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
-                    LIBMSRPC_GEN LIBMSRPC LIBADS''',
+                    LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI''',
+                    public_headers='lib/netapi/netapi.h',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('libsmbclient',
                     source=LIBSMBCLIENT_SRC,
                     public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
                     LIBMSRPC_GEN LIBMSRPC''',
+                    public_headers='include/libsmbclient.h',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('libsmbsharemodes',
                     source=LIBSMBSHAREMODES_SRC,
                     public_deps='''talloc tdb''',
+                    public_headers='include/smb_share_modes.h',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('libaddns',
                     source=LIBADDNS_SRC,
-                    public_deps='SOCKET_WRAPPER',
+                    deps='SOCKET_WRAPPER',
+                    public_deps='talloc krb5 k5crypto com_err gssapi gssapi_krb5',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC',
@@ -1221,7 +1051,13 @@ bld.SAMBA_SUBSYSTEM('LIBMSRPC',
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
                     source='${LIBNDR_GEN_SRC}',
-                    deps='LIBNDR NDR_SECURITY NDR_DCERPC',
+                    deps='''LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA
+                    NDR_ECHO''',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBGPO',
+                    source='${LIBGPO_SRC}',
+                    deps='gpext',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
@@ -1229,12 +1065,11 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     deps='talloc',
                     local_include=False)
 
-bld.SAMBA_SUBSYSTEM('AUTH',
-                    source=AUTH_SRC,
-                    deps='''AUTH_SAM AUTH_UNIX AUTH_WINBIND AUTH_WBC
-                            AUTH_SERVER AUTH_DOMAIN AUTH_BUILTIN
-                            AUTH_NETLOGOND''',
-                    vars=locals())
+bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
+                    source=LIBCLI_LDAP_MESSAGE_SRC)
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
+                    source=LIBCLI_LDAP_NDR_SRC)
 
 bld.SAMBA_SUBSYSTEM('AVAHI',
                     source=AVAHI_SRC,
@@ -1250,8 +1085,7 @@ bld.SAMBA_SUBSYSTEM('TLDAP',
 
 bld.SAMBA_SUBSYSTEM('PASSDB',
                     source=PASSDB_SRC,
-                    deps='''GROUPDB TLDAP SECRETS SMBLDAP PDB_SMBPASSWD
-                            PDB_TDBSAM PDB_WBC_SAM PDB_LDAP''',
+                    deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
@@ -1262,6 +1096,14 @@ bld.SAMBA_SUBSYSTEM('PARAM',
                     deps='PARAM_WITHOUT_REG DYNCONFIG',
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('REGFIO',
+                    source=REGFIO_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_API_REGF',
+                    source=REG_API_REGF_SRC,
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
                     source=POPT_LIB_SRC,
                     vars=locals())
@@ -1273,7 +1115,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY',
+                    deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY charset NDR_MESSAGING',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -1293,11 +1135,17 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
 
 bld.SAMBA_SUBSYSTEM('LIBSMB',
                     source=LIBSMB_SRC,
-                    deps='LIBSAMBA ZLIB',
+                    deps='LIBSAMBA ZLIB CLDAP',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('CLDAP',
+                    source=CLDAP_SRC,
+                    deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SECRETS',
                     source=SECRETS_SRC,
+                    deps='NDR_SECRETS',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SMBLDAP',
@@ -1307,44 +1155,121 @@ bld.SAMBA_SUBSYSTEM('SMBLDAP',
 
 bld.SAMBA_SUBSYSTEM('LIBADS',
                     source=LIBADS_SRC,
+                    deps='LIBCLI_LDAP_NDR',
                    vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,
+                    deps='NDR_KRB5PAC',
                    vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',
                     source=LIBADS_PRINTER_SRC,
                    vars=locals())
 
+bld.SAMBA_SUBSYSTEM('LIBAFS',
+                    source=AFS_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN',
+                    source=AFS_SETTOKEN_SRC,
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('SMBD_BASE',
                     source=SMBD_SRC_BASE,
                     deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
                     NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
                     PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
-                    VFS_DEFAULT RPC_MODULES AUTH LOCKING''',
+                    vfs vfs_default vfs_posixacl RPC_MODULES auth LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG
+                    REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR NDR_PERFCOUNT SOCKET_WRAPPER
+                    RPCCLI_WINREG''',
                     vars=locals())
 
+if not bld.env.developer:
+   bld.SAMBA_SUBSYSTEM('RPC_RPCECHO',
+                       source='')
+
 bld.SAMBA_SUBSYSTEM('RPC_MODULES',
                     source='',
                     deps='''RPC_LSARPC RPC_SAMR RPC_WINREG RPC_INITSHUTDOWN
                             RPC_DSSETUP RPC_WKSSVC RPC_SVCCTL RPC_NTSVCS
                             RPC_NETLOGON RPC_NETDFS RPC_SRVSVC RPC_SPOOLSS
-                            RPC_EVENTLOG''')
+                            RPC_EVENTLOG RPC_RPCECHO''')
 
 bld.SAMBA_SUBSYSTEM('LOCKING',
                     source='${LOCKING_SRC}',
                     deps='''tdb talloc''',
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('PROFILE',
+                    source='${PROFILE_SRC}',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PRINTBASE',
+                    source=PRINTBASE_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PRINTBACKEND',
+                    source=PRINTBACKEND_SRC,
+                    deps='PRINTBASE NDR_NTPRINTING LIBADS_PRINTER',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PRINTING',
+                    source=PRINTING_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PASSWD_UTIL',
+                    source=PASSWD_UTIL_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('DISPLAY_SEC',
+                    source=DISPLAY_SEC_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBNET',
+                    source=LIBNET_SRC,
+                    deps='NDR_LIBNET_JOIN',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBNET_DSSYNC',
+                    source=LIBNET_DSSYNC_SRC,
+                    deps='LIBNET',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBNET_SAMSYNC',
+                    source=LIBNET_SAMSYNC_SRC,
+                    deps='LIBNET',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBEVENTLOG',
+                    source=LIB_EVENTLOG_SRC,
+                    deps='NDR_EVENTLOG',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('SERVICES',
+                    source=SERVICES_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
+                    source=PLAINTEXT_AUTH_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('SLCACHE',
+                    source=SLCACHE_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('DCUTIL',
+                    source=DCUTIL_SRC,
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('LIBNDR',
                     source=LIBNDR_SRC,
                     vars=locals())
 
 #FIXME
 bld.SAMBA_SUBSYSTEM('NDR_STANDARD',
-                    source=LIBNDR_SRC,
+                    source='',
                     vars=locals())
 
 #FIXME
@@ -1363,10 +1288,6 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
                     source='../librpc/gen_ndr/ndr_dcerpc.c',
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
-                    source='../librpc/gen_ndr/ndr_srvsvc.c',
-                    vars=locals())
-
 bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
                    source='../libcli/util/doserr.c libsmb/nterr.c')
 
@@ -1379,6 +1300,14 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
                    source='../libcli/ndr_netlogon.c',
                    public_deps='LIBNDR NDR_SECURITY')
 
+bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG',
+                    source='../librpc/gen_ndr/cli_winreg.c',
+                    public_deps='RPC_NDR_WINREG')
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_ECHO',
+                    source='../librpc/gen_ndr/cli_echo.c',
+                    public_deps='RPC_NDR_ECHO')
+
 ########################## BINARIES #################################
 
 bld.SAMBA_BINARY('smbd/smbd',
@@ -1391,7 +1320,7 @@ bld.SAMBA_BINARY('nmbd/nmbd',
                  source=NMBD_SRC,
                  deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl
                  NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB
-                 POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSARPC''',
+                 POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
                  install_path='${SBINDIR}',
                  vars=locals())
 
@@ -1400,7 +1329,8 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
                  libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
-                 NSS_INFO_TEMPLATE
+                 SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
+                 LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
@@ -1410,7 +1340,7 @@ bld.SAMBA_BINARY('web/swat',
                  source=SWAT_SRC,
                  deps='''talloc tevent cap LIBS LIBSMB libwbclient PARAM
                  LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
-                 LIBMSRPC_GEN LIBMSRPC LOCKING''',
+                 LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING''',
                  enabled=bld.env.build_swat,
                  install_path='${SBINDIR}',
                  vars=locals())
@@ -1419,32 +1349,34 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
                  source=RPCCLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
-                 LIBADS''',
+                 LIBADS SMBREADLINE DISPLAY_SEC DCUTIL RPCCLI_WINREG RPCCLI_ECHO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbclient',
                  source=CLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN
-                 LIBMSRPC''',
+                 LIBMSRPC SMBREADLINE DISPLAY_SEC SOCKET_WRAPPER''',
                  vars=locals())
 
 bld.SAMBA_BINARY('net',
                  source=NET_SRC,
                  deps='''talloc tdb libnetapi libaddns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
-                 PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
-                 LOCALE_DIR''',
+                 PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER
+                 LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
+                 LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DISPLAY_SEC DCUTIL
+                 REGFIO NDR_NTPRINTING RPCCLI_WINREG''',
                  vars=locals())
 
 bld.SAMBA_BINARY('profiles',
                  source=PROFILES_SRC,
-                 deps='''talloc tdb cap tevent POPT_SAMBA PARAM LIBS LIBSMB_ERR LIB_NONSMBD''',
+                 deps='''talloc tdb cap tevent POPT_SAMBA PARAM LIBS LIBSMB_ERR LIB_NONSMBD REGFIO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbspool',
                  source=CUPS_SRC,
                  deps='''talloc tdb tevent resolv cap libwbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS
-                 KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
+                 KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('testparm',
@@ -1463,30 +1395,31 @@ bld.SAMBA_BINARY('smbta-util',
 bld.SAMBA_BINARY('smbstatus',
                  source=STATUS_SRC,
                  deps='''talloc tdb tevent cap PARAM POPT_SAMBA LIB_NONSMBD
-                 LIBSMB_ERR LOCKING''',
+                 LIBSMB_ERR LOCKING PROFILE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbcontrol',
                  source=SMBCONTROL_SRC,
-                 deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
+                 deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA PRINTBASE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbtree',
                  source=SMBTREE_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
-                 LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC''',
+                 LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PROFILE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbpasswd',
                  source=SMBPASSWD_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
-                 LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC''',
+                 LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PASSWD_UTIL''',
                  vars=locals())
 
 bld.SAMBA_BINARY('pdbedit',
                  source=PDBEDIT_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
-                 LIBSAMBA LIBSMB_ERR POPT_SAMBA PASSDB SMBLDAP GROUPDB''',
+                 LIBSAMBA LIBSMB_ERR POPT_SAMBA PASSDB SMBLDAP GROUPDB
+                 PASSWD_UTIL LIBCLI_LDAP_NDR''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbget',
@@ -1496,13 +1429,13 @@ bld.SAMBA_BINARY('smbget',
 
 bld.SAMBA_BINARY('nmblookup',
                  source=NMBLOOKUP_SRC,
-                 deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR''',
+                 deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR SOCKET_WRAPPER''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbtorture',
                  source=SMBTORTURE_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT
-                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
+                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_ECHO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbconftort',
@@ -1513,7 +1446,7 @@ bld.SAMBA_BINARY('smbconftort',
 bld.SAMBA_BINARY('masktest',
                  source=MASKTEST_SRC,
                  deps='''talloc tdb cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
+                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('msgtest',
@@ -1537,7 +1470,7 @@ bld.SAMBA_BINARY('smbcquotas',
 bld.SAMBA_BINARY('eventlogadm',
                  source=EVTLOGADM_SRC,
                  deps='''talloc tevent cap POPT_SAMBA LIBS PARAM
-                 LIB_NONSMBD LIBSMB_ERR PASSDB libwbclient''',
+                 LIB_NONSMBD LIBSMB_ERR PASSDB libwbclient LIBEVENTLOG''',
                  vars=locals())
 
 bld.SAMBA_BINARY('sharesec',
@@ -1548,7 +1481,7 @@ bld.SAMBA_BINARY('sharesec',
 bld.SAMBA_BINARY('locktest',
                  source=LOCKTEST_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC LOCKING''',
+                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING''',
                  vars=locals())
 
 bld.SAMBA_BINARY('nsstest',
@@ -1559,12 +1492,12 @@ bld.SAMBA_BINARY('nsstest',
 bld.SAMBA_BINARY('pdbtest',
                  source=PDBTEST_SRC,
                  deps='''talloc tdb cap resolv libwbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB
-                 SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSARPC''',
+                 SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('vfstest',
                  source=VFSTEST_SRC,
-                 deps='''SMBD_BASE''',
+                 deps='''SMBD_BASE SMBREADLINE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbiconv',
@@ -1580,18 +1513,18 @@ bld.SAMBA_BINARY('log2pcap',
 bld.SAMBA_BINARY('locktest2',
                  source=LOCKTEST2_SRC,
                  deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC LOCKING''',
+                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING''',
                  vars=locals())
 
 bld.SAMBA_BINARY('debug2html',
-                 source=LOG2PCAP_SRC,
+                 source=DEBUG2HTML_SRC,
                  deps='''talloc popt''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbfilter',
                  source=SMBFILTER_SRC,
                  deps='''talloc tevent cap resolv libwbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
-                 NDR_SAMR NDR_LSARPC''',
+                 NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('versiontest',
@@ -1602,7 +1535,7 @@ bld.SAMBA_BINARY('wbinfo',
                  source=WBINFO_SRC,
                  deps='''talloc libwbclient tevent cap
                  NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
-                 LIBSAMBA POPT_SAMBA''',
+                 LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
                  vars=locals())
 
 bld.SAMBA_BINARY('ntlm_auth',
@@ -1610,7 +1543,7 @@ bld.SAMBA_BINARY('ntlm_auth',
                  deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD
                  LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
                  PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER
-                 NDR_SAMR NDR_LSARPC''',
+                 NDR_SAMR NDR_LSA LIBCLI_LDAP_NDR''',
                  vars=locals())
 
 bld.SAMBA_BINARY('timelimit',
@@ -1645,6 +1578,11 @@ bld.SAMBA_BINARY('split_tokens',
                  LIBSAMBA''',
                  vars=locals())
 
+bld.SAMBA_BINARY('vlp',
+                 source=VLP_SRC,
+                 deps='''talloc tdb NSS_WRAPPER''',
+                 vars=locals())
+
 swat_files=recursive_dirlist('../swat', '../swat', '*')
 bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
 
@@ -1660,6 +1598,12 @@ bld.RECURSE('../lib/zlib')
 bld.RECURSE('../lib/tsocket')
 bld.RECURSE('../lib/iniparser/src')
 bld.RECURSE('../lib/crypto')
+bld.RECURSE('modules')
+bld.RECURSE('auth')
+bld.RECURSE('passdb')
+bld.RECURSE('winbindd')
+bld.RECURSE('libgpo/gpext')
+bld.RECURSE('pam_smbpass')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()