From bdbab1212390d85a82d4195fa67a5c63ac0678cb Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 26 Jul 2007 23:01:14 +0000 Subject: 2007-07-26 Havoc Pennington * 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. --- bus/activation-exit-codes.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'bus/activation-exit-codes.h') diff --git a/bus/activation-exit-codes.h b/bus/activation-exit-codes.h index 86a005ce..af6952e9 100644 --- a/bus/activation-exit-codes.h +++ b/bus/activation-exit-codes.h @@ -25,15 +25,21 @@ #ifndef BUS_ACTIVATION_EXIT_CODES_H #define BUS_ACTIVATION_EXIT_CODES_H -/** Return codes from the launch helper - not public API */ -#define BUS_SPAWN_EXIT_CODE_NO_MEMORY 1 -#define BUS_SPAWN_EXIT_CODE_CONFIG_INVALID 2 -#define BUS_SPAWN_EXIT_CODE_SETUP_FAILED 3 -#define BUS_SPAWN_EXIT_CODE_NAME_INVALID 4 -#define BUS_SPAWN_EXIT_CODE_SERVICE_NOT_FOUND 5 -#define BUS_SPAWN_EXIT_CODE_PERMISSIONS_INVALID 6 -#define BUS_SPAWN_EXIT_CODE_FILE_INVALID 7 -#define BUS_SPAWN_EXIT_CODE_EXEC_FAILED 8 -#define BUS_SPAWN_EXIT_CODE_INVALID_ARGS 9 +/** Return codes from the launch helper - not public API. However, + * presumably if some third party did write their own launch helper, + * they would have to rely on these, or at least always return + * 1 for GENERIC_FAILURE. + */ +#define BUS_SPAWN_EXIT_CODE_GENERIC_FAILURE 1 +#define BUS_SPAWN_EXIT_CODE_NO_MEMORY 2 +#define BUS_SPAWN_EXIT_CODE_CONFIG_INVALID 3 +#define BUS_SPAWN_EXIT_CODE_SETUP_FAILED 4 +#define BUS_SPAWN_EXIT_CODE_NAME_INVALID 5 +#define BUS_SPAWN_EXIT_CODE_SERVICE_NOT_FOUND 6 +#define BUS_SPAWN_EXIT_CODE_PERMISSIONS_INVALID 7 +#define BUS_SPAWN_EXIT_CODE_FILE_INVALID 8 +#define BUS_SPAWN_EXIT_CODE_EXEC_FAILED 9 +#define BUS_SPAWN_EXIT_CODE_INVALID_ARGS 10 +#define BUS_SPAWN_EXIT_CODE_CHILD_SIGNALED 11 #endif /* BUS_ACTIVATION_EXIT_CODES_H */ -- cgit