summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Silbe <sascha-web-bugs.freedesktop.org@silbe.org>2009-10-16 15:20:43 -0400
committerColin Walters <walters@verbum.org>2009-10-16 15:20:43 -0400
commit9b2c196ef36260ef455f0746f003aec6ffe6ff4c (patch)
tree845a6c0d3fd485987b6df3b6ca6723e441281524
parentbe89ffacc9051238d9b99b1b3e4fa5f67a9c7f5f (diff)
downloaddbus-9b2c196ef36260ef455f0746f003aec6ffe6ff4c.tar.gz
Bug 23977 - dbus-launch --exit-with-session not killing dbus-daemon on SIGINT
Handle SIGINT in the same way we handle SIGTERM.
-rw-r--r--tools/dbus-launch.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 912afba8..d3553e81 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -405,6 +405,7 @@ signal_handler (int sig)
#ifdef SIGHUP
case SIGHUP:
#endif
+ case SIGINT:
case SIGTERM:
got_sighup = TRUE;
break;
@@ -429,6 +430,7 @@ kill_bus_when_session_ends (void)
act.sa_flags = 0;
sigaction (SIGHUP, &act, NULL);
sigaction (SIGTERM, &act, NULL);
+ sigaction (SIGINT, &act, NULL);
#ifdef DBUS_BUILD_X11
x11_init();