From: John (J5) Palmieri <johnp@redhat.com>
Date: Fri, 1 Sep 2006 20:47:09 +0000 (+0000)
Subject: * tools/dbus-launch.c: Add a sigterm handler (patch from Frederic Crozat
X-Git-Tag: dbus-0.93~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee6964d6a0e4fe82f838d8d352d3c57aea773047;p=thirdparty%2Fdbus.git

* tools/dbus-launch.c: Add a sigterm handler (patch from Frederic Crozat
  <fcrozat at mandriva dot com>)
---

diff --git a/ChangeLog b/ChangeLog
index 5fde3c1d8..1658e70f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-01  John (J5) Palmieri  <johnp@redhat.com>
+
+	* tools/dbus-launch.c: Add a sigterm handler (patch from Frederic Crozat
+	<fcrozat at mandriva dot com>)
+
 2006-08-29  Havoc Pennington  <hp@redhat.com>
 
 	* test/test-service.c (path_message_func): fix lack of return value
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 3004099c4..18a6d156f 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -311,6 +311,7 @@ signal_handler (int sig)
   switch (sig)
     {
     case SIGHUP:
+    case SIGTERM:
       got_sighup = TRUE;
       break;
     }
@@ -336,6 +337,7 @@ kill_bus_when_session_ends (void)
   act.sa_mask    = empty_mask;
   act.sa_flags   = 0;
   sigaction (SIGHUP,  &act, NULL);
+  sigaction (SIGTERM,  &act, NULL);
   
 #ifdef DBUS_BUILD_X11
   xdisplay = XOpenDisplay (NULL);