summaryrefslogtreecommitdiffstats
path: root/bus/activation-helper-bin.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2007-07-26 23:01:14 +0000
committerHavoc Pennington <hp@redhat.com>2007-07-26 23:01:14 +0000
commitbdbab1212390d85a82d4195fa67a5c63ac0678cb (patch)
tree25f905d227f1a703bec0d64dcb6c8916cfed5f8b /bus/activation-helper-bin.c
parentba38a9b12ffee5d07f1e4a2a9585805695795219 (diff)
2007-07-26 Havoc Pennington <hp@redhat.com>
* bus/config-parser-trivial.c (check_return_values): disable a test that hardcoded the bus user's name * bus/dispatch.c (bus_dispatch_test_conf): remove the "if (!use_launcher)" around the tests, they were only failing because we didn't pass through all the expected errors from the helper. * bus/activation-exit-codes.h (BUS_SPAWN_EXIT_CODE_CHILD_SIGNALED): add a code for child segfaulting (BUS_SPAWN_EXIT_CODE_GENERIC_FAILURE): make "1" be a generic failure code, so if a third party launch helper were written it could just always return 1 on failure.
Diffstat (limited to 'bus/activation-helper-bin.c')
-rw-r--r--bus/activation-helper-bin.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/bus/activation-helper-bin.c b/bus/activation-helper-bin.c
index 248a86f7..4a359726 100644
--- a/bus/activation-helper-bin.c
+++ b/bus/activation-helper-bin.c
@@ -58,6 +58,9 @@ convert_error_to_exit_code (DBusError *error)
if (dbus_error_has_name (error, DBUS_ERROR_INVALID_ARGS))
return BUS_SPAWN_EXIT_CODE_INVALID_ARGS;
+
+ if (dbus_error_has_name (error, DBUS_ERROR_SPAWN_CHILD_SIGNALED))
+ return BUS_SPAWN_EXIT_CODE_CHILD_SIGNALED;
/* should we assert? */
fprintf(stderr, "%s: %s\n", error->name, error->message);