From: Sascha Silbe <sascha-web-bugs.freedesktop.org@silbe.org>
Date: Fri, 16 Oct 2009 19:20:43 +0000 (-0400)
Subject: Bug 23977 - dbus-launch --exit-with-session not killing dbus-daemon on SIGINT
X-Git-Tag: dbus-1.2.18~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b2c196ef36260ef455f0746f003aec6ffe6ff4c;p=thirdparty%2Fdbus.git

Bug 23977 - dbus-launch --exit-with-session not killing dbus-daemon on SIGINT

Handle SIGINT in the same way we handle SIGTERM.
---

diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 912afba8c..d3553e819 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();