From cfa261b49dd9cafb172deae3db22dba0c2e54bf9 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Wed, 2 Apr 2003 00:29:33 +0000
Subject: 2003-04-01  Havoc Pennington  <hp@redhat.com>

	* bus/config-parser.c, bus/bus.c: implement <servicedir> and
	<includedir> (at least mostly)

	* dbus/dbus-sysdeps.c (_dbus_change_identity): set the group ID
	first, then the user ID
---
 bus/bus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bus/bus.c')

diff --git a/bus/bus.c b/bus/bus.c
index 1ca4feb8..82452d07 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -187,7 +187,6 @@ bus_context_new (const DBusString *config_file,
   DBusList **addresses;
   BusConfigParser *parser;
   DBusString full_address;
-  const char *service_dirs[] = { NULL, NULL };
   const char *user;
   char **auth_mechanisms;
   DBusList **auth_mechanisms_list;
@@ -336,7 +335,8 @@ bus_context_new (const DBusString *config_file,
   /* Create activation subsystem */
   
   context->activation = bus_activation_new (context, &full_address,
-                                            service_dirs, error);
+                                            bus_config_parser_get_service_dirs (parser),
+                                            error);
   if (context->activation == NULL)
     {
       _DBUS_ASSERT_ERROR_IS_SET (error);
-- 
cgit