* tools/dbus-launch.c: Add a sigterm handler (patch from Frederic Crozat

  <fcrozat at mandriva dot com>)

diff --git a/ChangeLog b/ChangeLog
index 5fde3c1..1658e70 100644 (file)
--- 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 3004099..18a6d15 100644 (file)
--- 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);