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.

1 files changed, 2 insertions, 2 deletions

diff --git a/bus/bus.c b/bus/bus.c
index c66b7b36..043f2e1e 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -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;