diff options
author | Havoc Pennington <hp@redhat.com> | 2007-07-26 23:01:14 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2007-07-26 23:01:14 +0000 |
commit | bdbab1212390d85a82d4195fa67a5c63ac0678cb (patch) | |
tree | 25f905d227f1a703bec0d64dcb6c8916cfed5f8b /bus/config-parser-trivial.c | |
parent | ba38a9b12ffee5d07f1e4a2a9585805695795219 (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/config-parser-trivial.c')
-rw-r--r-- | bus/config-parser-trivial.c | 7 |
1 files changed, 5 insertions, 2 deletions
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 (" <user>dbus</user> OKAY!\n"); - + printf (" <user>dbus</user> OKAY!\n"); +#endif + /* check type return value is okay */ type = bus_config_parser_get_type (parser); if (type == NULL) |