From 73935792058af2664ebb59108ba6b3fed8e8fcc0 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Mon, 14 Mar 2016 16:33:49 -0700 Subject: [PATCH] Don't attempt to intercept SIGKILL, it doesn't work on any OS --- common/os_calls.c | 11 ----------- common/os_calls.h | 1 - sesman/chansrv/chansrv.c | 1 - sesman/sesman.c | 1 - sesman/sessvc/sessvc.c | 1 - xrdp/xrdp.c | 1 - xrdp/xrdpwin.c | 1 - 7 files changed, 17 deletions(-) diff --git a/common/os_calls.c b/common/os_calls.c index a4c98a75..57bb6a2f 100644 --- a/common/os_calls.c +++ b/common/os_calls.c @@ -2714,17 +2714,6 @@ g_signal_user_interrupt(void (*func)(int)) #endif } -/*****************************************************************************/ -/* does not work in win32 */ -void APP_CC -g_signal_kill(void (*func)(int)) -{ -#if defined(_WIN32) -#else - signal(SIGKILL, func); -#endif -} - /*****************************************************************************/ /* does not work in win32 */ void APP_CC diff --git a/common/os_calls.h b/common/os_calls.h index acfbe475..a4c05375 100644 --- a/common/os_calls.h +++ b/common/os_calls.h @@ -147,7 +147,6 @@ void APP_CC g_signal_child_stop(void (*func)(int)); void APP_CC g_signal_segfault(void (*func)(int)); void APP_CC g_signal_hang_up(void (*func)(int)); void APP_CC g_signal_user_interrupt(void (*func)(int)); -void APP_CC g_signal_kill(void (*func)(int)); void APP_CC g_signal_terminate(void (*func)(int)); void APP_CC g_signal_pipe(void (*func)(int)); void APP_CC g_signal_usr1(void (*func)(int)); diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c index b45fde34..fad2841d 100644 --- a/sesman/chansrv/chansrv.c +++ b/sesman/chansrv/chansrv.c @@ -1525,7 +1525,6 @@ main(int argc, char **argv) LOGM((LOG_LEVEL_ALWAYS, "main: app started pid %d(0x%8.8x)", pid, pid)); /* set up signal handler */ - g_signal_kill(term_signal_handler); /* SIGKILL */ g_signal_terminate(term_signal_handler); /* SIGTERM */ g_signal_user_interrupt(term_signal_handler); /* SIGINT */ g_signal_pipe(nil_signal_handler); /* SIGPIPE */ diff --git a/sesman/sesman.c b/sesman/sesman.c index 30ca3a79..e530464b 100644 --- a/sesman/sesman.c +++ b/sesman/sesman.c @@ -331,7 +331,6 @@ main(int argc, char **argv) #if 1 g_signal_hang_up(sig_sesman_reload_cfg); /* SIGHUP */ g_signal_user_interrupt(sig_sesman_shutdown); /* SIGINT */ - g_signal_kill(sig_sesman_shutdown); /* SIGKILL */ g_signal_terminate(sig_sesman_shutdown); /* SIGTERM */ g_signal_child_stop(sig_sesman_session_end); /* SIGCHLD */ #endif diff --git a/sesman/sessvc/sessvc.c b/sesman/sessvc/sessvc.c index ce62cb47..dce88d17 100644 --- a/sesman/sessvc/sessvc.c +++ b/sesman/sessvc/sessvc.c @@ -93,7 +93,6 @@ main(int argc, char **argv) return 1; } - g_signal_kill(term_signal_handler); /* SIGKILL */ g_signal_terminate(term_signal_handler); /* SIGTERM */ g_signal_user_interrupt(term_signal_handler); /* SIGINT */ g_signal_pipe(nil_signal_handler); /* SIGPIPE */ diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c index 12fcb2fa..b92bedd3 100644 --- a/xrdp/xrdp.c +++ b/xrdp/xrdp.c @@ -563,7 +563,6 @@ main(int argc, char **argv) g_threadid = tc_get_threadid(); g_listen = xrdp_listen_create(); g_signal_user_interrupt(xrdp_shutdown); /* SIGINT */ - g_signal_kill(xrdp_shutdown); /* SIGKILL */ g_signal_pipe(pipe_sig); /* SIGPIPE */ g_signal_terminate(xrdp_shutdown); /* SIGTERM */ g_signal_child_stop(xrdp_child); /* SIGCHLD */ diff --git a/xrdp/xrdpwin.c b/xrdp/xrdpwin.c index 99eb5c76..184ffd94 100644 --- a/xrdp/xrdpwin.c +++ b/xrdp/xrdpwin.c @@ -618,7 +618,6 @@ main(int argc, char **argv) g_threadid = tc_get_threadid(); g_listen = xrdp_listen_create(); g_signal_user_interrupt(xrdp_shutdown); /* SIGINT */ - g_signal_kill(xrdp_shutdown); /* SIGKILL */ g_signal_pipe(pipe_sig); /* SIGPIPE */ g_signal_terminate(xrdp_shutdown); /* SIGTERM */ g_sync_mutex = tc_mutex_create();