diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2016-04-17 17:40:43 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2016-04-17 17:40:43 -0700 |
| commit | 6c21aca50b6c57c55f204e86e4234650e98cff0a (patch) | |
| tree | ddcc69af88cc83c5b8d67009f92301e8f46150ba | |
| parent | 87208db090baba3b3249b31b50ace5fb78f44d60 (diff) | |
| parent | f7858e964db7406aa602492244bb992b11ee23ac (diff) | |
| download | xrdp-proprietary-6c21aca50b6c57c55f204e86e4234650e98cff0a.tar.gz xrdp-proprietary-6c21aca50b6c57c55f204e86e4234650e98cff0a.zip | |
Merge pull request #361 from metalefty/do-not-attempt-to-trap-sigkill
Do not attempt to trap SIGKILL part 2
| -rw-r--r-- | sesman/sig.c | 6 | ||||
| -rw-r--r-- | tests/tcp_proxy/main.c | 10 |
2 files changed, 1 insertions, 15 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..26c974cd 100644 --- a/tests/tcp_proxy/main.c +++ b/tests/tcp_proxy/main.c @@ -26,7 +26,7 @@ #include <errno.h> #include <locale.h> #include <netdb.h> -#include <sys/types.h> +#include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -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 */ |