2003-03-31 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket)
	(_dbus_transport_new_for_tcp_socket): these didn't need the "server"
	argument since they are always client side

	* dbus/dbus-server.c (dbus_server_get_address): new function

	* bus/main.c (main): take the configuration file as an argument.

	* test/data/valid-config-files/debug-allow-all.conf: new file to
	use with dispatch.c tests for example

	* bus/test-main.c (main): require test data dir

	* bus/bus.c (bus_context_new): change this to take a
	configuration file name as argument

	* doc/config-file.txt (Elements): add <servicedir>

	* bus/system.conf, bus/session.conf: new files

	* dbus/dbus-bus.c (dbus_bus_get): look for system bus on
	well-known socket if none set

	* configure.in: create system.conf and session.conf

1 files changed, 12 insertions, 8 deletions

diff --git a/bus/main.c b/bus/main.c
index ce03a6a7..905e4ba0 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -29,19 +29,23 @@ main (int argc, char **argv)
 {
   BusContext *context;
   DBusError error;
-  const char *paths[] = { NULL, NULL };
+  DBusString config_file;
+
+  /* FIXME I think the arguments should be like:
+   * --system    use standard system config file
+   * --session   use standard session config file
+   * --config-file=foo.conf  use some other file
+   */
   
-  if (argc < 3)
+  if (argc != 2)
     {
-      /* FIXME obviously just for testing */
-      _dbus_warn ("Give the server address as an argument and activation directory as args\n");
+      _dbus_warn ("The message bus configuration file must be given as the only argument\n");
       return 1;
     }
-
-  paths[0] = argv[2];
   
   dbus_error_init (&error);
-  context = bus_context_new (argv[1], paths, &error);
+  _dbus_string_init_const (&config_file, argv[1]);
+  context = bus_context_new (&config_file, &error);
   if (context == NULL)
     {
       _dbus_warn ("Failed to start message bus: %s\n",
@@ -55,6 +59,6 @@ main (int argc, char **argv)
   
   bus_context_shutdown (context);
   bus_context_unref (context);
-
+ 
   return 0;
 }