s3-waf: use proper RPC_X_SRC names.
[samba.git] / source3 / wscript_build
index 2325e1718f3b9b9365bdb6821c124f46f34f4aac..44deb38a2b8dd9a4b05832f65ed777388f1e8398 100644 (file)
@@ -23,7 +23,7 @@ AFS_SRC = 'lib/afs.c'
 
 AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
 
-AVAHI_SRC = '' # TODO: fix
+AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
 
 SERVER_MUTEX_SRC = 'lib/server_mutex.c'
 
@@ -49,22 +49,96 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.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/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'''
 
-LIBNDR_GEN_SRC1 = '''../librpc/gen_ndr/ndr_netlogon.c
+LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c
                   ../librpc/ndr/ndr_netlogon.c'''
 
-LIBNDR_GEN_SRC2 = '''../librpc/gen_ndr/ndr_spoolss.c
+LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
+                  ../librpc/ndr/ndr_schannel.c'''
+
+LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
                   ../librpc/ndr/ndr_spoolss_buf.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
+                     rpc_client/cli_spoolss.c
+                     rpc_client/init_spoolss.c'''
+
+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'''
+
+LIBCLI_DRSUAPI_SRC = '''
+                     librpc/gen_ndr/cli_drsuapi.c
+                     librpc/gen_ndr/ndr_drsuapi_c.c'''
+
+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'''
+
+LIBCLI_DSSETUP_SRC = '''
+                     librpc/gen_ndr/cli_dssetup.c
+                     librpc/gen_ndr/ndr_dssetup_c.c'''
+
+LIBCLI_SVCCTL_SRC = '''
+                    librpc/gen_ndr/cli_svcctl.c
+                    librpc/gen_ndr/ndr_svcctl_c.c'''
+
+LIBCLI_WKSSVC_SRC = '''
+                    librpc/gen_ndr/cli_wkssvc.c
+                    librpc/gen_ndr/ndr_wkssvc_c.c'''
+
+LIBCLI_SRVSVC_SRC = '''
+                    librpc/gen_ndr/cli_srvsvc.c
+                    librpc/gen_ndr/ndr_srvsvc_c.c'''
+
+LIBCLI_LSA_SRC = '''
+                 librpc/gen_ndr/cli_lsa.c
+                 librpc/gen_ndr/ndr_lsa_c.c
+                 rpc_client/cli_lsarpc.c
+                 rpc_client/init_lsa.c'''
+
+LIBCLI_SAMR_SRC = '''
+                  librpc/gen_ndr/cli_samr.c
+                  librpc/gen_ndr/ndr_samr_c.c
+                  rpc_client/cli_samr.c'''
+
+LIBCLI_NETLOGON_SRC = '''
+                      librpc/gen_ndr/cli_netlogon.c
+                      librpc/gen_ndr/ndr_netlogon_c.c
+                      rpc_client/cli_netlogon.c'''
+
+LIBCLI_EPMAPPER_SRC = '''
+                      librpc/gen_ndr/cli_epmapper.c
+                      librpc/gen_ndr/ndr_epmapper_c.c'''
+
 LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ${LIBNDR_GEN_SRC0}
                  ../librpc/gen_ndr/ndr_dfs.c
@@ -73,25 +147,18 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ../librpc/gen_ndr/ndr_initshutdown.c
                  ../librpc/gen_ndr/ndr_srvsvc.c
                  ../librpc/gen_ndr/ndr_eventlog.c
-                 ${LIBNDR_GEN_SRC1}
+                 ${LIBNDR_NETLOGON_SRC}
                  ../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_SPOOLSS_SRC}'''
 
-RPC_PARSE_SRC0 = '''rpc_parse/parse_prs.c rpc_parse/parse_misc.c'''
+LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
+                           ../librpc/ndr/ndr_ntprinting.c'''
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
-RPC_PARSE_SRC1 = '''${RPC_PARSE_SRC0}'''
-
-RPC_PARSE_SRC2 = '''rpc_parse/parse_rpc.c
-                 rpc_client/init_netlogon.c
-                 rpc_client/init_lsa.c'''
+REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 
 LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
 
@@ -137,6 +204,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC}
           lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
           lib/interfaces.c lib/memcache.c
           lib/talloc_dict.c
+          lib/util_sconn.c
           lib/serverid.c
           lib/util_transfer_file.c ../lib/async_req/async_sock.c
           ${TDB_LIB_SRC}
@@ -149,7 +217,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC}
           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_unistr.c lib/util_file.c lib/util_names.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
@@ -159,6 +227,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC}
           lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
           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
           ../libcli/security/sddl.c
@@ -175,7 +244,8 @@ READLINE_SRC = '''lib/readline.c'''
 
 POPT_LIB_SRC = '''lib/popt_common.c'''
 
-PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c lib/sharesec.c lib/ldap_debug_handler.c'''
+PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
+                           lib/sharesec.c lib/ldap_debug_handler.c'''
 PARAM_REG_ADD_SRC = '''${REG_SMBCONF_SRC} ${LIBSMBCONF_SRC} ${PRIVILEGES_BASIC_SRC}'''
 PARAM_SRC = '''${PARAM_REG_ADD_SRC}'''
 
@@ -198,13 +268,17 @@ LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
               ${GPEXT_SRC}'''
 LIBGPO_SRC = '''${LIBGPO_SRC0}'''
 
-LIBADS_SRC = '''libads/ldap.c libads/ldap_printer.c
+LIBADS_SRC = '''libads/ldap.c
              libads/sasl.c libads/sasl_wrapping.c
-             libads/krb5_setpw.c libads/ldap_user.c
+             libads/krb5_setpw.c
+             libads/kerberos_util.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/disp_sec.c libads/ldap_utils.c
              libads/ldap_schema.c libads/util.c libads/ndr.c'''
 
+LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
+
 LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
                     ../librpc/ndr/ndr_krb5pac.c
                     ../librpc/gen_ndr/ndr_krb5pac.c'''
@@ -229,14 +303,17 @@ 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}'
+LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1} ${REG_PARSE_PRS_SRC}'
 
 LIBSMB_SRC0 = '''
                ../libcli/auth/ntlm_check.c
                libsmb/ntlmssp.c
-               libsmb/ntlmssp_sign.c
+               libsmb/ntlmssp_wrap.c
+               ../libcli/auth/ntlmssp.c
+               ../libcli/auth/ntlmssp_sign.c
                ${LIBNDR_NTLMSSP_SRC}
-               ../libcli/auth/ntlmssp_ndr.c'''
+               ../libcli/auth/ntlmssp_ndr.c
+              ../libcli/auth/ntlmssp_server.c'''
 
 LIBSAMBA_SRC = '${LIBSMB_SRC0}'
 
@@ -253,8 +330,7 @@ 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'''
+               ${LIBNDR_SCHANNEL_SRC}'''
 
 LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clikrb5.c libsmb/clispnego.c
@@ -270,41 +346,28 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              ${CLDAP_SRC}
              ${DRSUAPI_SRC}'''
 
-RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c
-                  ${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'''
-
-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}'''
+LIBMSRPC_SRC = '''
+               ${SCHANNEL_SRC}
+               rpc_client/cli_pipe.c
+               librpc/rpc/rpc_common.c
+               librpc/rpc/dcerpc_gssapi.c
+               librpc/rpc/dcerpc_krb5.c
+               librpc/rpc/dcerpc_spnego.c
+               rpc_client/rpc_transport_np.c
+               rpc_client/rpc_transport_sock.c
+               ../librpc/rpc/binding.c
+               ../librpc/rpc/dcerpc_util.c
+               librpc/rpc/dcerpc_helpers.c
+               ../librpc/rpc/binding_handle.c'''
+
+LIBMSRPC_GEN_SRC = '''
+                   ${LIBCLI_EPMAPPER_SRC}
+                   ${LIBNDR_GEN_SRC}'''
 
 #
 # registry-related objects
 #
 UTIL_REG_SRC = '''../libcli/registry/util_reg.c'''
-UTIL_REG_API_SRC = '''lib/util_reg_api.c'''
 
 REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
 REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
@@ -332,15 +395,15 @@ REG_BASE_SRC = '''registry/reg_api.c
                registry/reg_cachehook.c
                ${REGFIO_SRC}
                ${REGSRCS_SRC}
-               registry/reg_util.c
-               ${UTIL_REG_API_SRC}
+               registry/reg_util_internal.c
                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_INIT_SMBCONF_SRC}
+                 registry/reg_util_token.c'''
 
 REG_FULL_SRC = '''${REG_SMBCONF_SRC}
                ${REG_BACKENDS_EXTRA_SRC}
@@ -354,26 +417,29 @@ LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
 
 RPC_STATIC = ''
 
-RPC_LSA_SRC = '''rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c'''
+RPC_LSARPC_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'''
+RPC_NETLOGON_SRC = '''rpc_server/srv_netlog_nt.c
+                      ../librpc/gen_ndr/srv_netlogon.c'''
 
 RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c
                rpc_server/srv_samr_util.c
+              rpc_server/srv_samr_chgpasswd.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'''
+RPC_WINREG_SRC = '''rpc_server/srv_winreg_nt.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'''
+RPC_SRVSVC_SRC = '''rpc_server/srv_srvsvc_nt.c
+                    ../librpc/gen_ndr/srv_srvsvc.c'''
 
-RPC_WKS_SRC = ''' ../librpc/gen_ndr/srv_wkssvc.c rpc_server/srv_wkssvc_nt.c'''
+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
@@ -384,26 +450,30 @@ RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c
 RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c
                  ../librpc/gen_ndr/srv_ntsvcs.c'''
 
-RPC_DFS_SRC = ''' ../librpc/gen_ndr/srv_dfs.c rpc_server/srv_dfs_nt.c'''
+RPC_NETDFS_SRC = '''../librpc/gen_ndr/srv_dfs.c
+                    rpc_server/srv_dfs_nt.c'''
 
 RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c
+                     rpc_server/srv_spoolss_util.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'''
 
-RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c
-               rpc_server/srv_pipe.c rpc_server/srv_lsa_hnd.c'''
+NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
+                     ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
+
+RPC_NCACN_NP_INTERNAL = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_np_internal.c
+                        rpc_server/rpc_handles.c'''
 
-RPC_ECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
+RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
+               ${RPC_NCACN_NP_INTERNAL}'''
 
-#TODO: RPC_SERVER_SRC used to include RPC_STATIC modules
-RPC_SERVER_SRC = '''${RPC_PIPE_SRC}'''
+RPC_RPCECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
 
-RPC_PARSE_SRC = '''${RPC_PARSE_SRC2}'''
+RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC} ${RPC_STATIC}'''
 
-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_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
 
 LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
 
@@ -415,12 +485,13 @@ 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'
+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'
 
-SECRETS_SRC = 'passdb/secrets.c passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.c'
+SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
+                 passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.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
@@ -447,7 +518,8 @@ PROFILES_SRC = '''utils/profiles.c
 OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
              smbd/oplock_onefs.c'''
 
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
+NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
+                librpc/gen_ndr/ndr_notify.c'''
 
 FNAME_UTIL_SRC = '''smbd/filename_util.c'''
 
@@ -519,7 +591,7 @@ 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/auth_compat.c auth/auth_ntlmssp.c auth/user_info.c auth/check_samsec.c
-           auth/server_info.c auth/server_info_sam.c
+           auth/user_util.c auth/user_krb5.c auth/server_info.c auth/server_info_sam.c
            ${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
 
 #FIXME: set IDMAP_STATIC during configuration
@@ -553,16 +625,18 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_misc.c
                    winbindd/winbindd_cm.c
                    winbindd/winbindd_wins.c
+                   winbindd/winbindd_msrpc.c
                    winbindd/winbindd_rpc.c
                    winbindd/winbindd_reconnect.c
                    winbindd/winbindd_ads.c
-                   winbindd/winbindd_passdb.c
+                   winbindd/winbindd_samr.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
@@ -624,29 +698,36 @@ WINBINDD_SRC1 = '''winbindd/winbindd.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
                    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
+                   auth/auth_util.c
                    auth/token_util.c
+                   auth/user_util.c
                    auth/check_samsec.c
                    auth/server_info.c
                    auth/server_info_sam.c
                    auth/user_info.c
-                   smbd/chgpasswd.c
+                   auth/user_util.c
+                  rpc_server/srv_samr_chgpasswd.c
                    ../nsswitch/libwbclient/wb_reqtrans.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
-                  ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC} ${RPC_PARSE_SRC}
-                  ${PROFILE_SRC} ${SLCACHE_SRC} ${SMBLDAP_SRC}
+                  ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+                  ${PROFILE_SRC} ${SLCACHE_SRC}
                   ${LIBADS_SRC}
                   ${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
                   ${AFS_SRC} ${AFS_SETTOKEN_SRC}
                   ${LIBADS_SERVER_SRC}
-                  ${TDB_VALIDATE_SRC}'''
+                  ${RPC_NCACN_NP_INTERNAL} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
+                  ${TDB_VALIDATE_SRC}
+                  ${LIBCLI_DSSETUP_SRC}
+                  ${LIBCLI_LSA_SRC}
+                  ${LIBCLI_SAMR_SRC}
+                  ${LIBCLI_NETLOGON_SRC}
+                  rpc_client/init_netlogon.c'''
 
 LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c librpc/gen_ndr/ndr_libnet_join.c'
 
@@ -656,12 +737,12 @@ LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
 
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
 
-SMBD_SRC_MAIN = '''smbd/server.c'''
+SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.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_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
+               smbd/utmp.c smbd/session.c
                smbd/dfree.c smbd/dir.c smbd/password.c smbd/conn.c
                smbd/share_access.c smbd/fileio.c
                smbd/ipc.c smbd/lanman.c smbd/negprot.c
@@ -672,9 +753,10 @@ SMBD_SRC_SRV = '''smbd/files.c smbd/chgpasswd.c smbd/connection.c
                smbd/vfs.c smbd/perfcount.c smbd/statcache.c smbd/seal.c
                smbd/posix_acls.c lib/sysacls.c
                smbd/process.c smbd/service.c smbd/error.c
-               printing/printfsp.c lib/sysquotas.c lib/sysquotas_linux.c
+               printing/printspoolss.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/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
@@ -703,32 +785,41 @@ SMBD_SRC_SRV = '''smbd/files.c smbd/chgpasswd.c smbd/connection.c
                ${MANGLE_SRC} ${VFS_STATIC}'''
 
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
-                ${RPC_SERVER_SRC} ${RPC_PARSE_SRC}
+                ${RPC_SERVER_SRC}
                 ${LOCKING_SRC} ${PRINTING_SRC}
                 ${PROFILE_SRC} ${PRINTBACKEND_SRC}
                 ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
                 ${LIBMSRPC_SRC}
-                ${LIBMSRPC_GEN_SRC} ${AVAHI_SRC} ${LIBADS_SRC}
-                ${LIBADS_SERVER_SRC} ${REG_FULL_SRC}
-                ${BUILDOPT_SRC} ${SMBLDAP_SRC}
+                ${LIBMSRPC_GEN_SRC} ${LIBADS_SRC}
+                ${LIBADS_SERVER_SRC} ${LIBADS_PRINTER_SRC} ${REG_FULL_SRC}
+                ${BUILDOPT_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}
+                ${LIBCLI_SPOOLSS_SRC}
+                ${LIBCLI_WINREG_SRC}
+                ${LIBCLI_SRVSVC_SRC}
+                ${LIBCLI_LSA_SRC}
+                ${LIBCLI_SAMR_SRC}
+                ${LIBCLI_NETLOGON_SRC}
+                ${RPC_CLIENT_SCHANNEL_SRC}
+                rpc_client/init_netlogon.c
+                rpc_client/init_samr.c
                 ${AUTH_SRC}
-                ${PRIVILEGES_BASIC_SRC}'''
+                ${PRIVILEGES_BASIC_SRC}
+                ${LIBNDR_XATTR_SRC}'''
 
 PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_cups.c printing/print_generic.c
-               printing/lpq_parse.c printing/load.c
+               printing/lpq_parse.c printing/load.c printing/print_standard.c
                printing/print_iprint.c'''
 
 PRINTBASE_SRC = '''printing/notify.c printing/printing_db.c'''
-PRINTBACKEND_SRC = 'printing/printing.c printing/nt_printing.c ${PRINTBASE_SRC}'
+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}'''
 
 SMBD_SRC = '''${SMBD_SRC_BASE} ${SMBD_SRC_MAIN}'''
 
@@ -753,8 +844,10 @@ SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
 SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
            ${LOCKING_SRC}
            ${PLAINTEXT_AUTH_SRC}
-           ${SMBLDAP_SRC} ${RPC_PARSE_SRC} ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
-           ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}'''
+           ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
+           ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
+           ${LIBCLI_SAMR_SRC}
+          rpc_client/init_lsa.c'''
 
 WBINFO_SRC = '../nsswitch/wbinfo.c ${AFS_SETTOKEN_SRC}'
 
@@ -767,9 +860,19 @@ EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
                ../librpc/gen_ndr/ndr_eventlog.c
                ../librpc/gen_ndr/ndr_lsa.c'''
 
-LIBS='ICONV'
+DISPLAY_SEC_SRC= '../libcli/security/display_sec.c'
+
+CLIENT_SRC1 = '''client/client.c client/clitar.c
+                 client/dnsbrowse.c
+                 ${LIBMSRPC_SRC}'''
 
-bld.env.AWK = 'gawk'
+CLIENT_SRC = '''${CLIENT_SRC1} ${LIBMSRPC_GEN_SRC}
+                ${READLINE_SRC} ${DISPLAY_SEC_SRC}
+                ${LIBCLI_SRVSVC_SRC}
+               rpc_client/init_lsa.c'''
+
+
+LIBS='ICONV'
 
 bld.SAMBA_GENERATOR('build_options',
                     source='include/config.h script/mkbuildoptions.awk',
@@ -835,6 +938,11 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     deps='talloc',
                     local_include=False)
 
+bld.SAMBA_SUBSYSTEM('AVAHI',
+                    source=AVAHI_SRC,
+                    deps='avahi-common avahi-client',
+                    enabled=bld.env.with_avahi)
+
 bld.SAMBA_SUBSYSTEM('GROUPDB',
                     source=GROUPDB_SRC)
 
@@ -861,11 +969,12 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 
 bld.SAMBA_SUBSYSTEM('KRBCLIENT',
                     source=KRBCLIENT_SRC,
+                    deps='krb5 k5crypto com_err gssapi gssapi_krb5',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='NSS_WRAPPER',
+                    deps='NSS_WRAPPER iconv',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -875,7 +984,7 @@ bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
 
 bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
                     source=LIBSMB_ERR_SRC,
-                    deps='SECRETS',
+                    deps='SECRETS SMBLDAP',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBSAMBA',
@@ -892,13 +1001,18 @@ bld.SAMBA_SUBSYSTEM('SECRETS',
                     source=SECRETS_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('SMBLDAP',
+                    source=SMBLDAP_SRC,
+                    deps='ldap lber',
+                    vars=locals())
+
 ########################## BINARIES #################################
 
 bld.SAMBA_BINARY('smbd/smbd',
                  source=SMBD_SRC,
                  deps='''tdb DYNCONFIG tevent dl krb5 ldap gssapi gssapi_krb5
                  NSS_WRAPPER LIBWBCLIENT crypt nsl cups cap resolv ZLIB PASSDB
-                 PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT''',
+                 PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI''',
                  install_path='${SBINDIR}',
                  vars=locals())
 
@@ -915,18 +1029,24 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  deps='''talloc tdb tevent cap dl DYNCONFIG ZLIB NSS_WRAPPER
                  LIBWBCLIENT PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT''',
-                 enabled=Options.options.with_winbind,
+                 enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
                  vars=locals())
 
 bld.SAMBA_BINARY('web/swat',
                  source=SWAT_SRC,
-                 deps='''talloc tevent DYNCONFIG LIBS LIBSMB LIBWBCLIENT PARAM
-                 LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT''',
-                 enabled=Options.options.with_swat,
+                 deps='''talloc tevent cap DYNCONFIG LIBS LIBSMB LIBWBCLIENT PARAM
+                 LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups''',
+                 enabled=bld.env.build_swat,
                  install_path='${SBINDIR}',
                  vars=locals())
 
+bld.SAMBA_BINARY('smbclient',
+                 source=CLIENT_SRC,
+                 deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
+                 PARAM_WITHOUT_REG LIBWBCLIENT DYNCONFIG PARAM KRBCLIENT''',
+                 vars=locals())
+
 bld.SAMBA_BINARY('wbinfo',
                  source=WBINFO_SRC,
                  deps='''talloc LIBWBCLIENT DYNCONFIG tevent cap
@@ -943,7 +1063,7 @@ bld.SAMBA_BINARY('testparm',
 
 bld.SAMBA_BINARY('eventlogadm',
                  source=EVTLOGADM_SRC,
-                 deps='''talloc tevent POPT_SAMBA DYNCONFIG LIBS PARAM
+                 deps='''talloc tevent cap POPT_SAMBA DYNCONFIG LIBS PARAM
                  LIB_NONSMBD LIBSMB_ERR PASSDB LIBWBCLIENT''',
                  vars=locals())