jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #361 from metalefty/do-not-attempt-to-trap-sigkill

Browse Source 
Do not attempt to trap SIGKILL part 2
This commit is contained in:
jsorg71 2016-04-17 17:40:43 -07:00
commit 6c21aca50b
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sesman/sig.c
View File

@ -158,7 +158,6 @@ sig_handler_thread(void *arg)
sigaddset(&waitmask, SIGHUP); sigaddset(&waitmask, SIGHUP);
sigaddset(&waitmask, SIGCHLD); sigaddset(&waitmask, SIGCHLD);
sigaddset(&waitmask, SIGTERM); sigaddset(&waitmask, SIGTERM);
sigaddset(&waitmask, SIGKILL);
sigaddset(&waitmask, SIGINT); sigaddset(&waitmask, SIGINT);
// sigaddset(&waitmask, SIGFPE); // sigaddset(&waitmask, SIGFPE);
@ -188,11 +187,6 @@ sig_handler_thread(void *arg)
LOG_DBG("sesman received SIGINT", 0); LOG_DBG("sesman received SIGINT", 0);
sig_sesman_shutdown(recv_signal); sig_sesman_shutdown(recv_signal);
break; break;
case SIGKILL:
/* we die */
LOG_DBG("sesman received SIGKILL", 0);
sig_sesman_shutdown(recv_signal);
break;
case SIGTERM: case SIGTERM:
/* we die */ /* we die */
LOG_DBG("sesman received SIGTERM", 0); LOG_DBG("sesman received SIGTERM", 0);

8
tests/tcp_proxy/main.c
View File

@ -397,13 +397,6 @@ g_signal_user_interrupt(void (*func)(int))
signal(SIGINT, func); signal(SIGINT, func);
} }
/*****************************************************************************/
static void APP_CC
g_signal_kill(void (*func)(int))
{
signal(SIGKILL, func);
}
/*****************************************************************************/ /*****************************************************************************/
static void APP_CC static void APP_CC
g_signal_terminate(void (*func)(int)) g_signal_terminate(void (*func)(int))
@ -685,7 +678,6 @@ main(int argc, char **argv)
g_init("tcp_proxy"); g_init("tcp_proxy");
g_signal_user_interrupt(proxy_shutdown); /* SIGINT */ g_signal_user_interrupt(proxy_shutdown); /* SIGINT */
g_signal_kill(proxy_shutdown); /* SIGKILL */
g_signal_usr1(clear_counters); /* SIGUSR1 */ g_signal_usr1(clear_counters); /* SIGUSR1 */
g_signal_terminate(proxy_shutdown); /* SIGTERM */ g_signal_terminate(proxy_shutdown); /* SIGTERM */