diff options
| author | Koichiro IWAO <meta@vmeta.jp> | 2016-04-11 16:43:12 +0900 |
|---|---|---|
| committer | Koichiro IWAO <meta@vmeta.jp> | 2016-04-11 16:43:12 +0900 |
| commit | cfdce461c3f12183da4094296139197ad2a6cb45 (patch) | |
| tree | 46076a7def55b6fc51505943e03b2d9e74d360b0 | |
| parent | 87208db090baba3b3249b31b50ace5fb78f44d60 (diff) | |
| download | xrdp-proprietary-cfdce461c3f12183da4094296139197ad2a6cb45.tar.gz xrdp-proprietary-cfdce461c3f12183da4094296139197ad2a6cb45.zip | |
Do not attempt to trap SIGKILL part 2
it doesn't work on any OS.
| -rw-r--r-- | sesman/sig.c | 6 | ||||
| -rw-r--r-- | tests/tcp_proxy/main.c | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/sesman/sig.c b/sesman/sig.c index d881515b..b10be5fb 100644 --- a/sesman/sig.c +++ b/sesman/sig.c @@ -158,7 +158,6 @@ sig_handler_thread(void *arg) sigaddset(&waitmask, SIGHUP); sigaddset(&waitmask, SIGCHLD); sigaddset(&waitmask, SIGTERM); - sigaddset(&waitmask, SIGKILL); sigaddset(&waitmask, SIGINT); // sigaddset(&waitmask, SIGFPE); @@ -188,11 +187,6 @@ sig_handler_thread(void *arg) LOG_DBG("sesman received SIGINT", 0); sig_sesman_shutdown(recv_signal); break; - case SIGKILL: - /* we die */ - LOG_DBG("sesman received SIGKILL", 0); - sig_sesman_shutdown(recv_signal); - break; case SIGTERM: /* we die */ LOG_DBG("sesman received SIGTERM", 0); diff --git a/tests/tcp_proxy/main.c b/tests/tcp_proxy/main.c index 1cc58889..1a275395 100644 --- a/tests/tcp_proxy/main.c +++ b/tests/tcp_proxy/main.c @@ -399,13 +399,6 @@ g_signal_user_interrupt(void (*func)(int)) /*****************************************************************************/ static void APP_CC -g_signal_kill(void (*func)(int)) -{ - signal(SIGKILL, func); -} - -/*****************************************************************************/ -static void APP_CC g_signal_terminate(void (*func)(int)) { signal(SIGTERM, func); @@ -685,7 +678,6 @@ main(int argc, char **argv) g_init("tcp_proxy"); g_signal_user_interrupt(proxy_shutdown); /* SIGINT */ - g_signal_kill(proxy_shutdown); /* SIGKILL */ g_signal_usr1(clear_counters); /* SIGUSR1 */ g_signal_terminate(proxy_shutdown); /* SIGTERM */ |