diff options
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_rpc_register.c | 377 | ||||
| -rw-r--r-- | source3/rpc_server/srv_rpc_register.h | 29 | ||||
| -rw-r--r-- | source3/smbd/server.c | 92 |
4 files changed, 411 insertions, 90 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index c319f7b952..7e07435bbf 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -722,6 +722,8 @@ RPC_RPCECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o RPC_EPMAPPER_OBJ = rpc_server/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o +RPC_SERVER_REGISTER_OBJ = rpc_server/srv_rpc_register.o $(DCE_RPC_EP_OBJ) + RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \ $(RPC_DSSETUP_OBJ) $(RPC_WKSSVC_OBJ) $(RPC_SVCCTL_OBJ) \ $(RPC_NTSVCS_OBJ) $(RPC_NETLOGON_OBJ) $(RPC_NETDFS_OBJ) \ @@ -734,6 +736,7 @@ RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \ $(LIBCLI_LSA_OBJ) \ $(LIBCLI_SAMR_OBJ) \ $(LIBCLI_NETLOGON_OBJ) \ + $(RPC_SERVER_REGISTER_OBJ) \ $(RPC_CLIENT_SCHANNEL_OBJ) \ rpc_client/init_netlogon.o \ rpc_client/init_samr.o diff --git a/source3/rpc_server/srv_rpc_register.c b/source3/rpc_server/srv_rpc_register.c new file mode 100644 index 0000000000..b3e563dd3b --- /dev/null +++ b/source3/rpc_server/srv_rpc_register.c @@ -0,0 +1,377 @@ +/* + * Unix SMB/CIFS implementation. + * + * SMBD RPC service callbacks + * + * Copyright (c) 2011 Andreas Schneider <asn@samba.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "includes.h" + +#include "../librpc/gen_ndr/srv_epmapper.h" +#include "../librpc/gen_ndr/srv_srvsvc.h" +#include "../librpc/gen_ndr/srv_winreg.h" +#include "../librpc/gen_ndr/srv_dfs.h" +#include "../librpc/gen_ndr/srv_dssetup.h" +#include "../librpc/gen_ndr/srv_echo.h" +#include "../librpc/gen_ndr/srv_eventlog.h" +#include "../librpc/gen_ndr/srv_initshutdown.h" +#include "../librpc/gen_ndr/srv_lsa.h" +#include "../librpc/gen_ndr/srv_netlogon.h" +#include "../librpc/gen_ndr/srv_ntsvcs.h" +#include "../librpc/gen_ndr/srv_samr.h" +#include "../librpc/gen_ndr/srv_spoolss.h" +#include "../librpc/gen_ndr/srv_svcctl.h" +#include "../librpc/gen_ndr/srv_wkssvc.h" + +#include "printing/nt_printing_migrate.h" + +#include "librpc/rpc/dcerpc_ep.h" + +#include "rpc_server/srv_rpc_register.h" + +static NTSTATUS _rpc_ep_register(const struct ndr_interface_table *iface, + const char *name) +{ + struct dcerpc_binding_vector *v = NULL; + NTSTATUS status; + + status = dcerpc_binding_vector_create(talloc_tos(), + iface, + &v); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + status = dcerpc_ep_register(iface, + v, + &iface->syntax_id.uuid, + name); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + return status; +} + +static NTSTATUS _rpc_ep_unregister(const struct ndr_interface_table *iface) +{ + struct dcerpc_binding_vector *v = NULL; + NTSTATUS status; + + status = dcerpc_binding_vector_create(talloc_tos(), + iface, + &v); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + status = dcerpc_ep_unregister(iface, + v, + &iface->syntax_id.uuid); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + return status; +} + +static bool winreg_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_winreg, "winreg")); +} + +static bool winreg_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_winreg)); +} + +static bool srvsvc_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_srvsvc, "srvsvc")); +} + +static bool srvsvc_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_srvsvc)); +} + +static bool lsarpc_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_lsarpc, "lsarpc")); +} + +static bool lsarpc_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_lsarpc)); +} + +static bool samr_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_samr, "samr")); +} + +static bool samr_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_samr)); +} + +static bool netlogon_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_netlogon, "netlogon")); +} + +static bool netlogon_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_netlogon)); +} + +static bool spoolss_init_cb(void *ptr) +{ + struct messaging_context *msg_ctx = talloc_get_type_abort( + ptr, struct messaging_context); + NTSTATUS status; + bool ok; + + /* + * Migrate the printers first. + */ + ok = nt_printing_tdb_migrate(msg_ctx); + if (!ok) { + return false; + } + + status =_rpc_ep_register(&ndr_table_spoolss, "spoolss"); + if (!NT_STATUS_IS_OK(status)) { + return false; + } + + return true; +} + + + +static bool spoolss_shutdown_cb(void *ptr) +{ + srv_spoolss_cleanup(); + + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_spoolss)); +} + +static bool svcctl_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_svcctl, "svcctl")); +} + +static bool svcctl_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_svcctl)); +} + +static bool ntsvcs_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_ntsvcs, "ntsvcs")); +} + +static bool ntsvcs_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_ntsvcs)); +} + +static bool eventlog_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_eventlog, + "eventlog")); +} + +static bool eventlog_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_eventlog)); +} + +static bool initshutdown_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_initshutdown, + "initshutdown")); +} + +static bool initshutdown_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_initshutdown)); +} + +static bool rpcecho_init_cb(void *ptr) { + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_rpcecho, "rpcecho")); +} + +static bool rpcecho_shutdown_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_rpcecho)); +} + +static bool netdfs_init_cb(void *ptr) +{ + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_netdfs, "netdfs")); +} + +static bool netdfs_shutdown_cb(void *ptr) { + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_netdfs)); +} + +static bool dssetup_init_cb(void *ptr) { + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_dssetup, "dssetup")); +} + +static bool dssetup_shutdown_cb(void *ptr) { + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_dssetup)); +} + +static bool wkssvc_init_cb(void *ptr) { + return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_wkssvc, "wkssvc")); +} + +static bool wkssvc_shutdown_cb(void *ptr) { + return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_wkssvc)); +} + +bool srv_rpc_register(struct messaging_context *msg_ctx) { + struct rpc_srv_callbacks winreg_cb; + struct rpc_srv_callbacks srvsvc_cb; + + struct rpc_srv_callbacks lsarpc_cb; + struct rpc_srv_callbacks samr_cb; + struct rpc_srv_callbacks netlogon_cb; + + struct rpc_srv_callbacks spoolss_cb; + struct rpc_srv_callbacks svcctl_cb; + struct rpc_srv_callbacks ntsvcs_cb; + struct rpc_srv_callbacks eventlog_cb; + struct rpc_srv_callbacks initshutdown_cb; + struct rpc_srv_callbacks netdfs_cb; + struct rpc_srv_callbacks rpcecho_cb; + struct rpc_srv_callbacks dssetup_cb; + struct rpc_srv_callbacks wkssvc_cb; + + if (!NT_STATUS_IS_OK(rpc_epmapper_init(NULL))) { + return false; + } + + winreg_cb.init = winreg_init_cb; + winreg_cb.shutdown = winreg_shutdown_cb; + winreg_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_winreg_init(&winreg_cb))) { + return false; + } + + srvsvc_cb.init = srvsvc_init_cb; + srvsvc_cb.shutdown = srvsvc_shutdown_cb; + srvsvc_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_srvsvc_init(&srvsvc_cb))) { + return false; + } + + + lsarpc_cb.init = lsarpc_init_cb; + lsarpc_cb.shutdown = lsarpc_shutdown_cb; + lsarpc_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_lsarpc_init(&lsarpc_cb))) { + return false; + } + + samr_cb.init = samr_init_cb; + samr_cb.shutdown = samr_shutdown_cb; + samr_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_samr_init(&samr_cb))) { + return false; + } + + netlogon_cb.init = netlogon_init_cb; + netlogon_cb.shutdown = netlogon_shutdown_cb; + netlogon_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_netlogon_init(&netlogon_cb))) { + return false; + } + + spoolss_cb.init = spoolss_init_cb; + spoolss_cb.shutdown = spoolss_shutdown_cb; + spoolss_cb.private_data = msg_ctx; + if (!NT_STATUS_IS_OK(rpc_spoolss_init(&spoolss_cb))) { + return false; + } + + + svcctl_cb.init = svcctl_init_cb; + svcctl_cb.shutdown = svcctl_shutdown_cb; + svcctl_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_svcctl_init(&svcctl_cb))) { + return false; + } + + ntsvcs_cb.init = ntsvcs_init_cb; + ntsvcs_cb.shutdown = ntsvcs_shutdown_cb; + ntsvcs_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_ntsvcs_init(&ntsvcs_cb))) { + return false; + } + + eventlog_cb.init = eventlog_init_cb; + eventlog_cb.shutdown = eventlog_shutdown_cb; + eventlog_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_eventlog_init(&eventlog_cb))) { + return false; + } + + initshutdown_cb.init = initshutdown_init_cb; + initshutdown_cb.shutdown = initshutdown_shutdown_cb; + initshutdown_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_initshutdown_init(&initshutdown_cb))) { + return false; + } + + netdfs_cb.init = netdfs_init_cb; + netdfs_cb.shutdown = netdfs_shutdown_cb; + netdfs_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_netdfs_init(&netdfs_cb))) { + return false; + } +#ifdef DEVELOPER + + rpcecho_cb.init = rpcecho_init_cb; + rpcecho_cb.shutdown = rpcecho_shutdown_cb; + rpcecho_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_rpcecho_init(&rpcecho_cb))) { + return false; + } +#endif + + dssetup_cb.init = dssetup_init_cb; + dssetup_cb.shutdown = dssetup_shutdown_cb; + dssetup_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_dssetup_init(&dssetup_cb))) { + return false; + } + + wkssvc_cb.init = wkssvc_init_cb; + wkssvc_cb.shutdown = wkssvc_shutdown_cb; + wkssvc_cb.private_data = NULL; + if (!NT_STATUS_IS_OK(rpc_wkssvc_init(&wkssvc_cb))) { + return false; + } + + return true; +} + +/* vim: set ts=8 sw=8 noet cindent ft=c.doxygen: */ diff --git a/source3/rpc_server/srv_rpc_register.h b/source3/rpc_server/srv_rpc_register.h new file mode 100644 index 0000000000..0a98e706f8 --- /dev/null +++ b/source3/rpc_server/srv_rpc_register.h @@ -0,0 +1,29 @@ +/* + * Unix SMB/CIFS implementation. + * + * SMBD RPC service callbacks + * + * Copyright (c) 2011 Andreas Schneider <asn@samba.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _SMBD_RPC_CALLBACKS_H +#define _SMBD_RPC_CALLBACKS_H + +bool srv_rpc_register(struct messaging_context *msg_ctx); + +#endif /* _SMBD_RPC_CALLBACKS_H */ + +/* vim: set ts=8 sw=8 noet cindent ft=c.doxygen: */ diff --git a/source3/smbd/server.c b/source3/smbd/server.c index cd79863506..10e8b62430 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -32,24 +32,7 @@ #include "memcache.h" #include "ctdbd_conn.h" #include "printing/printer_list.h" - -#include "../librpc/gen_ndr/srv_dfs.h" -#include "../librpc/gen_ndr/srv_dssetup.h" -#include "../librpc/gen_ndr/srv_echo.h" -#include "../librpc/gen_ndr/srv_eventlog.h" -#include "../librpc/gen_ndr/srv_initshutdown.h" -#include "../librpc/gen_ndr/srv_lsa.h" -#include "../librpc/gen_ndr/srv_netlogon.h" -#include "../librpc/gen_ndr/srv_ntsvcs.h" -#include "../librpc/gen_ndr/srv_samr.h" -#include "../librpc/gen_ndr/srv_spoolss.h" -#include "../librpc/gen_ndr/srv_srvsvc.h" -#include "../librpc/gen_ndr/srv_svcctl.h" -#include "../librpc/gen_ndr/srv_winreg.h" -#include "../librpc/gen_ndr/srv_wkssvc.h" -#include "../librpc/gen_ndr/srv_epmapper.h" - -#include "printing/nt_printing_migrate.h" +#include "rpc_server/srv_rpc_register.h" #ifdef WITH_DFS extern int dcelogin_atmost_once; @@ -845,20 +828,6 @@ static bool init_structs(void ) return True; } -static bool spoolss_init_cb(void *ptr) -{ - struct messaging_context *msg_ctx = talloc_get_type_abort( - ptr, struct messaging_context); - return nt_printing_tdb_migrate(msg_ctx); -} - -static bool spoolss_shutdown_cb(void *ptr) -{ - srv_spoolss_cleanup(); - - return true; -} - /**************************************************************************** main program. ****************************************************************************/ @@ -907,7 +876,6 @@ extern void build_options(bool screen); TALLOC_CTX *frame; NTSTATUS status; uint64_t unique_id; - struct rpc_srv_callbacks spoolss_cb; /* * Do this before any other talloc operation @@ -1225,63 +1193,7 @@ extern void build_options(bool screen); return -1; } - /* - * Initialize spoolss with an init function to convert printers first. - * static_init_rpc will try to initialize the spoolss server too but you - * can't register it twice. - */ - spoolss_cb.init = spoolss_init_cb; - spoolss_cb.shutdown = spoolss_shutdown_cb; - spoolss_cb.private_data = smbd_server_conn->msg_ctx; - - /* - * TODO: Create a dependency tree, so that all services are started - * in the right order. - */ - if (!NT_STATUS_IS_OK(rpc_lsarpc_init(NULL))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_samr_init(NULL))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_netlogon_init(NULL))) { - exit(1); - } - - if (!NT_STATUS_IS_OK(rpc_winreg_init(NULL))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_srvsvc_init(NULL))) { - exit(1); - } - - if (!NT_STATUS_IS_OK(rpc_spoolss_init(&spoolss_cb))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_svcctl_init(NULL))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_ntsvcs_init(NULL))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_eventlog_init(NULL))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_initshutdown_init(NULL))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_netdfs_init(NULL))) { - exit(1); - } -#ifdef DEVELOPER - if (!NT_STATUS_IS_OK(rpc_rpcecho_init(NULL))) { - exit(1); - } -#endif - if (!NT_STATUS_IS_OK(rpc_dssetup_init(NULL))) { - exit(1); - } - if (!NT_STATUS_IS_OK(rpc_wkssvc_init(NULL))) { + if (!srv_rpc_register(smbd_server_conn->msg_ctx)) { exit(1); } |