summaryrefslogtreecommitdiffstats
path: root/bus/activation.c
diff options
context:
space:
mode:
Diffstat (limited to 'bus/activation.c')
-rw-r--r--bus/activation.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/bus/activation.c b/bus/activation.c
index c49bc881..d5162ec2 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -1122,13 +1122,14 @@ pending_activation_failed (BusPendingActivation *pending_activation,
* Depending on the exit code of the helper, set the error accordingly
*/
static void
-handle_activation_exit_error (int exit_code, DBusError *error)
+handle_activation_exit_error (int exit_code,
+ DBusError *error)
{
switch (exit_code)
{
case BUS_SPAWN_EXIT_CODE_NO_MEMORY:
- dbus_set_error (error, DBUS_ERROR_SPAWN_SETUP_FAILED,
- "Launcher could not run as out of memory");
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY,
+ "Launcher could not run (out of memory)");
break;
case BUS_SPAWN_EXIT_CODE_SETUP_FAILED:
dbus_set_error (error, DBUS_ERROR_SPAWN_SETUP_FAILED,
@@ -1154,6 +1155,10 @@ handle_activation_exit_error (int exit_code, DBusError *error)
dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
"Cannot launch daemon, file not found or permissions invalid");
break;
+ case BUS_SPAWN_EXIT_CODE_INVALID_ARGS:
+ dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
+ "Invalid arguments to command line");
+ break;
default:
dbus_set_error (error, DBUS_ERROR_SPAWN_CHILD_EXITED,
"Launch helper exited with unknown return code %i", exit_code);