From ca39dc522ce199111d4921f05c3bbc43376ef9cc Mon Sep 17 00:00:00 2001 From: Alexey Tikhonov Date: Mon, 9 Dec 2019 17:20:28 +0100 Subject: [PATCH 1/3] providers/krb5: got rid of unused code --- src/providers/krb5/krb5_common.c | 10 ---------- src/providers/krb5/krb5_common.h | 7 ------- 2 files changed, 17 deletions(-) diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index bfda561c12..5c11c347b2 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -1133,16 +1133,6 @@ void remove_krb5_info_files_callback(void *pvt) talloc_free(ctx); } -void krb5_finalize(struct tevent_context *ev, - struct tevent_signal *se, - int signum, - int count, - void *siginfo, - void *private_data) -{ - orderly_shutdown(0); -} - errno_t krb5_get_simple_upn(TALLOC_CTX *mem_ctx, struct krb5_ctx *krb5_ctx, struct sss_domain_info *dom, const char *username, const char *user_dom, char **_upn) diff --git a/src/providers/krb5/krb5_common.h b/src/providers/krb5/krb5_common.h index cc93131153..493d12e5fe 100644 --- a/src/providers/krb5/krb5_common.h +++ b/src/providers/krb5/krb5_common.h @@ -196,13 +196,6 @@ int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, void remove_krb5_info_files_callback(void *pvt); -void krb5_finalize(struct tevent_context *ev, - struct tevent_signal *se, - int signum, - int count, - void *siginfo, - void *private_data); - errno_t remove_krb5_info_files(TALLOC_CTX *mem_ctx, const char *realm); errno_t krb5_get_simple_upn(TALLOC_CTX *mem_ctx, struct krb5_ctx *krb5_ctx, From 17b5e87a061f3189173dd83549be6c549ef5d699 Mon Sep 17 00:00:00 2001 From: Alexey Tikhonov Date: Mon, 9 Dec 2019 17:48:14 +0100 Subject: [PATCH 2/3] data_provider_be: got rid of duplicating SIGTERM handler It was wrong to install two libtevent SIGTERM handlers both of which did orderly_shutdown()->exit(). Naturally only one of the handlers was executed (as process was terminated with exit()) and libtevent docs doesn't say anything about order of execution. But chances are, be_process_finalize() was executed first so default_quit() was not executed and main_ctx was not freed. Moreover there is just no reason to have separate be_process_finalize() at all: default server handler default_quit() frees main_ctx. And be_ctx is linked to main_ctx so will be freed by default handler as well. Resolves: https://pagure.io/SSSD/sssd/issue/4088 --- src/providers/data_provider_be.c | 37 -------------------------------- 1 file changed, 37 deletions(-) diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c index cfcf0268dc..ce00231ff5 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -445,36 +445,6 @@ be_register_monitor_iface(struct sbus_connection *conn, struct be_ctx *be_ctx) return sbus_connection_add_path_map(be_ctx->mon_conn, paths); } -static void be_process_finalize(struct tevent_context *ev, - struct tevent_signal *se, - int signum, - int count, - void *siginfo, - void *private_data) -{ - struct be_ctx *be_ctx; - - be_ctx = talloc_get_type(private_data, struct be_ctx); - talloc_free(be_ctx); - orderly_shutdown(0); -} - -static errno_t be_process_install_sigterm_handler(struct be_ctx *be_ctx) -{ - struct tevent_signal *sige; - - BlockSignals(false, SIGTERM); - - sige = tevent_add_signal(be_ctx->ev, be_ctx, SIGTERM, SA_SIGINFO, - be_process_finalize, be_ctx); - if (sige == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, "tevent_add_signal failed.\n"); - return ENOMEM; - } - - return EOK; -} - static void dp_initialized(struct tevent_req *req); errno_t be_process_init(TALLOC_CTX *mem_ctx, @@ -566,13 +536,6 @@ errno_t be_process_init(TALLOC_CTX *mem_ctx, goto done; } - /* Install signal handler */ - ret = be_process_install_sigterm_handler(be_ctx); - if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, "be_install_sigterm_handler failed.\n"); - goto done; - } - req = dp_init_send(be_ctx, be_ctx->ev, be_ctx, be_ctx->uid, be_ctx->gid); if (req == NULL) { ret = ENOMEM; From e9ef8290f33921aab9915d923e5c84dbc30bc80a Mon Sep 17 00:00:00 2001 From: Alexey Tikhonov Date: Mon, 9 Dec 2019 18:26:56 +0100 Subject: [PATCH 3/3] util/server: improved debug at shutdown Relates: https://pagure.io/SSSD/sssd/issue/4088 --- src/util/server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/server.c b/src/util/server.c index ee57ac128e..33524066ed 100644 --- a/src/util/server.c +++ b/src/util/server.c @@ -242,7 +242,8 @@ void orderly_shutdown(int status) kill(-getpgrp(), SIGTERM); } #endif - if (status == 0) sss_log(SSS_LOG_INFO, "Shutting down"); + DEBUG(SSSDBG_IMPORTANT_INFO, "Shutting down (status = %d)", status); + sss_log(SSS_LOG_INFO, "Shutting down (status = %d)", status); exit(status); }