summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorРоман Донченко <dpb corrigendum ru>2014-06-11 11:38:24 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-06-11 11:38:24 +0100
commit5c7ea35c3dfc564f5c5679a663d5b9c101c61910 (patch)
tree5394fa54f18a536338ae7cc69ee6f41adb242bb1
parent3488de849d09de774e4df7f1a4463ce2ee39d861 (diff)
downloaddbus-5c7ea35c3dfc564f5c5679a663d5b9c101c61910.tar.gz
dbus-launch: kill bus if we can't attach to a session when requested
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=74698 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--tools/dbus-launch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 58a0322e..41a20e83 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -536,7 +536,7 @@ kill_bus_when_session_ends (void)
if (tty_fd < 0 && x_fd < 0)
{
fprintf (stderr, "No terminal on standard input and no X display; cannot attach message bus to session lifetime\n");
- exit (1);
+ kill_bus_and_exit (1);
}
while (TRUE)