From: Samuel Cabrero Date: Tue, 28 May 2019 14:54:52 +0000 (+0200) Subject: s3:rpc_server: Remove unused RPC module init and shutdown callbacks X-Git-Tag: ldb-2.2.0~1305 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93224d4184dfbc369667d6a56c08ff217d839d93;p=thirdparty%2Fsamba.git s3:rpc_server: Remove unused RPC module init and shutdown callbacks The setup function registers the endpoint server and RPC core routines initialize and shutdown it. Signed-off-by: Samuel Cabrero Reviewed-by: Andrew Bartlett --- diff --git a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c index e04c19e684b..c09d430a610 100644 --- a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c +++ b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c @@ -72,8 +72,6 @@ static bool rpc_setup_mdssvc(struct tevent_context *ev_ctx, static struct rpc_module_fns rpc_module_mdssvc_fns = { .setup = rpc_setup_mdssvc, - .init = NULL, - .shutdown = NULL }; static_decl_rpc; diff --git a/source3/rpc_server/rpc_modules.c b/source3/rpc_server/rpc_modules.c index d8f24bc1220..be678eb5f81 100644 --- a/source3/rpc_server/rpc_modules.c +++ b/source3/rpc_server/rpc_modules.c @@ -100,42 +100,3 @@ bool setup_rpc_modules(struct tevent_context *ev_ctx, return true; } - -bool init_rpc_module(const char *name, - const struct rpc_srv_callbacks *rpc_srv_cb) -{ - struct rpc_module *module = find_rpc_module(name); - NTSTATUS status; - - if (module == NULL) { - return false; - } - - status = module->fns->init(rpc_srv_cb); - if (!NT_STATUS_IS_OK(status)) { - DBG_ERR("calling init for %s failed %s\n", - name, nt_errstr(status)); - return false; - } - - return true; -} - -bool shutdown_rpc_module(const char *name) -{ - struct rpc_module *module = find_rpc_module(name); - NTSTATUS status; - - if (module == NULL) { - return false; - } - - status = module->fns->shutdown(); - if (!NT_STATUS_IS_OK(status)) { - DBG_ERR("calling shutdown for %s failed %s\n", - name, nt_errstr(status)); - return false; - } - - return true; -} diff --git a/source3/rpc_server/rpc_modules.h b/source3/rpc_server/rpc_modules.h index afac1d911ca..ccdaabb4cce 100644 --- a/source3/rpc_server/rpc_modules.h +++ b/source3/rpc_server/rpc_modules.h @@ -22,12 +22,9 @@ #ifndef _RPC_MODULES_H #define _RPC_MODULES_H -struct rpc_srv_callbacks; - struct rpc_module_fns { - bool (*setup)(struct tevent_context *ev_ctx, struct messaging_context *msg_ctx); - NTSTATUS (*init)(const struct rpc_srv_callbacks *rpc_srv_cb); - NTSTATUS (*shutdown)(void); + bool (*setup)(struct tevent_context *ev_ctx, + struct messaging_context *msg_ctx); }; NTSTATUS register_rpc_module(struct rpc_module_fns *fns, @@ -39,9 +36,4 @@ bool setup_rpc_modules(struct tevent_context *ev_ctx, bool setup_rpc_module(struct tevent_context *ev_ctx, struct messaging_context *msg_ctx, const char *name); - -bool init_rpc_module(const char *name, - const struct rpc_srv_callbacks *rpc_srv_cb); - -bool shutdown_rpc_module(const char *name); #endif