diff options
| -rw-r--r-- | source3/rpc_server/wscript_build | 185 | ||||
| -rw-r--r-- | source3/wscript | 30 | ||||
| -rw-r--r-- | source3/wscript_build | 4 |
3 files changed, 80 insertions, 139 deletions
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index 145e00e93a..d516d28428 100644 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -1,10 +1,11 @@ #!/usr/bin/env python -RPC_LSARPC_SRC = '''srv_lsa_nt.c''' +RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c''' RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c''' RPC_SAMR_SRC = '''srv_samr_nt.c srv_samr_util.c - srv_samr_chgpasswd.c''' + srv_samr_chgpasswd.c + ../../librpc/gen_ndr/srv_samr.c''' RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c ../../librpc/gen_ndr/srv_initshutdown.c''' RPC_WINREG_SRC = '''srv_winreg_nt.c ../../librpc/gen_ndr/srv_winreg.c''' RPC_DSSETUP_SRC = '''srv_dssetup_nt.c ../../librpc/gen_ndr/srv_dssetup.c''' @@ -23,6 +24,18 @@ bld.SAMBA_SUBSYSTEM('rpc', deps='RPC_PIPE_REGISTER', vars=locals()) +bld.SAMBA_SUBSYSTEM('RPC_NCACN_NP', + source='rpc_ncacn_np.c rpc_handles.c') + +bld.SAMBA_SUBSYSTEM('RPC_SERVICE', + source='rpc_server.c') + +bld.SAMBA_SUBSYSTEM('RPC_CRYPTO', + source='dcesrv_ntlmssp.c dcesrv_gssapi.c dcesrv_spnego.c') + +bld.SAMBA_SUBSYSTEM('RPC_PIPE_REGISTER', + source='srv_pipe_register.c') + bld.SAMBA_SUBSYSTEM('RPC_SAMR', source=RPC_SAMR_SRC, deps='PLAINTEXT_AUTH', @@ -32,123 +45,63 @@ bld.SAMBA_SUBSYSTEM('RPC_LSARPC', source=RPC_LSARPC_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_NCACN_NP', - source='rpc_ncacn_np.c rpc_handles.c') +bld.SAMBA_SUBSYSTEM('RPC_WINREG', + source=RPC_WINREG_SRC, + deps='REGFIO REG_API_REGF NDR_PERFCOUNT', + vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_SERVICE', - source='rpc_server.c') +bld.SAMBA_SUBSYSTEM('RPC_INITSHUTDOWN', + source=RPC_INITSHUTDOWN_SRC, + vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_CRYPTO', - source='dcesrv_ntlmssp.c dcesrv_gssapi.c dcesrv_spnego.c') +bld.SAMBA_SUBSYSTEM('RPC_DSSETUP', + source=RPC_DSSETUP_SRC, + vars=locals()) -bld.SAMBA_SUBSYSTEM('RPC_PIPE_REGISTER', - source='srv_pipe_register.c') +bld.SAMBA_SUBSYSTEM('RPC_WKSSVC', + source=RPC_WKSSVC_SRC, + deps='LIBNET', + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_SVCCTL', + source=RPC_SVCCTL_SRC, + deps='SERVICES', + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_NTSVCS', + source=RPC_NTSVCS_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_NETLOGON', + source=RPC_NETLOGON_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_NETDFS', + source=RPC_NETDFS_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_SRVSVC', + source=RPC_SRVSVC_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_SPOOLSS', + source=RPC_SPOOLSS_SRC, + deps='cups PRINTING PRINTBACKEND RPCCLI_WINREG', + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_EVENTLOG', + source=RPC_EVENTLOG_SRC, + deps='LIBEVENTLOG', + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_RPCECHO', + source=RPC_RPCECHO_SRC, + vars=locals()) bld.SAMBA_SUBSYSTEM('RPC_SERVER', source='srv_pipe_hnd.c srv_pipe.c', - deps='RPC_NCACN_NP RPC_SERVICE RPC_CRYPTO') - -bld.SAMBA_MODULE('rpc_lsarpc', - subsystem='rpc', - source='../../librpc/gen_ndr/srv_lsa.c', - deps='RPC_LSARPC', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_lsarpc'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_lsarpc')) - -bld.SAMBA_MODULE('rpc_samr', - subsystem='rpc', - source='../../librpc/gen_ndr/srv_samr.c', - deps='RPC_SAMR', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_samr'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_samr')) - -bld.SAMBA_MODULE('rpc_winreg', - subsystem='rpc', - source=RPC_WINREG_SRC, - deps='REGFIO REG_API_REGF NDR_PERFCOUNT', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_winreg'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_winreg')) - -bld.SAMBA_MODULE('rpc_initshutdown', - subsystem='rpc', - source=RPC_INITSHUTDOWN_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_initshutdown'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_initshutdown')) - -bld.SAMBA_MODULE('rpc_dssetup', - subsystem='rpc', - source=RPC_DSSETUP_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_dssetup'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_dssetup')) - -bld.SAMBA_MODULE('rpc_wkssvc', - subsystem='rpc', - source=RPC_WKSSVC_SRC, - deps='LIBNET', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_wkssvc'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_wkssvc')) - -bld.SAMBA_MODULE('rpc_svcctl', - subsystem='rpc', - source=RPC_SVCCTL_SRC, - deps='SERVICES', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_svcctl'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_svcctl')) - -bld.SAMBA_MODULE('rpc_ntsvcs', - subsystem='rpc', - source=RPC_NTSVCS_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_ntsvcs'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_ntsvcs')) - -bld.SAMBA_MODULE('rpc_netlogon', - subsystem='rpc', - source=RPC_NETLOGON_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_netlogon'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_netlogon')) - -bld.SAMBA_MODULE('rpc_netdfs', - subsystem='rpc', - source=RPC_NETDFS_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_netdfs'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_netdfs')) - -bld.SAMBA_MODULE('rpc_srvsvc', - subsystem='rpc', - source=RPC_SRVSVC_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_srvsvc'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_srvsvc')) - -bld.SAMBA_MODULE('rpc_spoolss', - subsystem='rpc', - source=RPC_SPOOLSS_SRC, - deps='cups PRINTING PRINTBACKEND RPCCLI_WINREG', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_spoolss'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_spoolss')) - -bld.SAMBA_MODULE('rpc_eventlog', - subsystem='rpc', - source=RPC_EVENTLOG_SRC, - deps='LIBEVENTLOG', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_eventlog'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_eventlog')) - -bld.SAMBA_MODULE('rpc_rpcecho', - subsystem='rpc', - source=RPC_RPCECHO_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_rpcecho'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_rpcecho')) + deps='''RPC_NCACN_NP RPC_SERVICE RPC_CRYPTO + RPC_SAMR RPC_LSARPC RPC_WINREG RPC_INITSHUTDOWN + RPC_DSSETUP RPC_WKSSVC RPC_SVCCTL RPC_NTSVCS + RPC_NETLOGON RPC_NETDFS RPC_SRVSVC RPC_SPOOLSS + RPC_EVENTLOG RPC_RPCECHO RPC_SERVER''') diff --git a/source3/wscript b/source3/wscript index 684461ffd0..dfb9929cfb 100644 --- a/source3/wscript +++ b/source3/wscript @@ -335,10 +335,8 @@ return acl_get_perm_np(permset_d, perm); headers='sys/types.h sys/statfs.h', execute=True) - default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam pdb_ldap 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 auth_sam auth_unix auth_winbind auth_wbc auth_server + default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam pdb_ldap + auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template idmap_ldap idmap_tdb idmap_passdb idmap_nss''') @@ -353,7 +351,7 @@ return acl_get_perm_np(permset_d, perm); vfs_time_audit idmap_autorid''') if Options.options.developer: - default_static_modules.extend(TO_LIST('rpc_rpcecho pdb_ads')) + default_static_modules.extend(TO_LIST('pdb_ads')) default_shared_modules.extend(TO_LIST('charset_weird perfcount_test')) if Options.options.with_acl_support and conf.CONFIG_SET('HAVE_POSIX_ACLS'): @@ -388,7 +386,7 @@ return acl_get_perm_np(permset_d, perm); static_list = {} shared_list = {} - prefixes = ['vfs', 'pdb', 'rpc', 'auth', 'nss_info', 'charset', 'idmap', 'gpext', 'perfcount'] + prefixes = ['vfs', 'pdb', 'auth', 'nss_info', 'charset', 'idmap', 'gpext', 'perfcount'] conf.env['MODULE_PREFIXES'] = prefixes for p in prefixes: for m in final_static_modules: @@ -409,20 +407,12 @@ return acl_get_perm_np(permset_d, perm); conf.env[shared_env] = [] if p in static_list: decl_list="" - if p == "rpc": - for entry in static_list[p]: - decl_list += "extern NTSTATUS %s_init(const struct rpc_srv_callbacks *rpc_srv_cb); " % entry - conf.env[static_env].append('%s' % entry) - decl_list = decl_list.rstrip() - conf.DEFINE('static_decl_%s' % p, decl_list) - conf.DEFINE('static_init_%s' % p, '{ %s_init(NULL); }' % '_init(NULL); '.join(static_list[p])) - else: - for entry in static_list[p]: - decl_list += "extern NTSTATUS %s_init(void); " % entry - conf.env[static_env].append('%s' % entry) - decl_list = decl_list.rstrip() - conf.DEFINE('static_decl_%s' % p, decl_list) - conf.DEFINE('static_init_%s' % p, '{ %s_init(); }' % '_init(); '.join(static_list[p])) + for entry in static_list[p]: + decl_list += "extern NTSTATUS %s_init(void); " % entry + conf.env[static_env].append('%s' % entry) + decl_list = decl_list.rstrip() + conf.DEFINE('static_decl_%s' % p, decl_list) + conf.DEFINE('static_init_%s' % p, '{ %s_init(); }' % '_init(); '.join(static_list[p])) else: conf.DEFINE('static_decl_%s' % p, '') conf.DEFINE('static_init_%s' % p, '{}') diff --git a/source3/wscript_build b/source3/wscript_build index a5cf898069..21da0699c5 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -389,9 +389,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c lib/wb_reqtrans.c''' WINBINDD_SRC = '''${WINBINDD_SRC1} - ${TDB_VALIDATE_SRC} - ../librpc/gen_ndr/srv_lsa.c - ../librpc/gen_ndr/srv_samr.c''' + ${TDB_VALIDATE_SRC}''' MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c''' |