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/config-parser-trivial.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bus/config-parser-trivial.c') diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c index b825047a..98d554e8 100644 --- a/bus/config-parser-trivial.c +++ b/bus/config-parser-trivial.c @@ -353,13 +353,16 @@ check_return_values (const DBusString *full_path) _dbus_warn ("User was NULL!\n"); goto finish; } +#if 0 + /* the username can be configured in configure.in so this test doesn't work */ if (strcmp (user, "dbus") != 0) { _dbus_warn ("User was invalid; '%s'!\n", user); goto finish; } - printf (" dbus OKAY!\n"); - + printf (" dbus OKAY!\n"); +#endif + /* check type return value is okay */ type = bus_config_parser_get_type (parser); if (type == NULL) -- cgit