diff options
author | David Zeuthen <davidz@redhat.com> | 2004-09-12 10:23:42 +0000 |
---|---|---|
committer | David Zeuthen <davidz@redhat.com> | 2004-09-12 10:23:42 +0000 |
commit | a24270a451c4ac7f8018bdd909a8f762e6abe80c (patch) | |
tree | ec7369b34b78779be8ee0bcb1b652b1571fd4275 /bus/bus.c | |
parent | a9ff341aa66588c12275529ee2d16843b493cb4f (diff) |
2004-09-12 David Zeuthen <david@fubar.dk>
Patch from Kay Sievers <kay.sievers@vrfy.org>
* bus/bus.c (bus_context_new):
* bus/bus.h:
* bus/main.c (usage)
(main):
Add commandline option --nofork to override configuration file
setting.
Diffstat (limited to 'bus/bus.c')
-rw-r--r-- | bus/bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -537,7 +537,7 @@ load_config (BusContext *context, BusContext* bus_context_new (const DBusString *config_file, - dbus_bool_t force_fork, + ForceForkSetting force_fork, int print_addr_fd, int print_pid_fd, DBusError *error) @@ -656,7 +656,7 @@ bus_context_new (const DBusString *config_file, } /* Now become a daemon if appropriate */ - if (force_fork || context->fork) + if ((force_fork != FORK_NEVER && context->fork) || force_fork == FORK_ALWAYS) { DBusString u; |