2003-04-15 Havoc Pennington <hp@pobox.com>

	* bus/bus.c: create and keep around a shared DBusUserDatabase
	object.

	* bus/connection.c (bus_connection_get_groups): don't cache
	groups for user in the connection object, since user database
	object now does that.

1 files changed, 24 insertions, 22 deletions

diff --git a/bus/bus.h b/bus/bus.h
index 885182c7..7369d220 100644
--- a/bus/bus.h
+++ b/bus/bus.h
@@ -29,6 +29,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-string.h>
 #include <dbus/dbus-mainloop.h>
+#include <dbus/dbus-userdb.h>
 
 typedef struct BusActivation    BusActivation;
 typedef struct BusConnections   BusConnections;
@@ -40,28 +41,29 @@ typedef struct BusRegistry      BusRegistry;
 typedef struct BusService       BusService;
 typedef struct BusTransaction   BusTransaction;
 
-BusContext*      bus_context_new                    (const DBusString *config_file,
-                                                     int               print_addr_fd,
-                                                     DBusError        *error);
-void             bus_context_shutdown               (BusContext       *context);
-void             bus_context_ref                    (BusContext       *context);
-void             bus_context_unref                  (BusContext       *context);
-const char*      bus_context_get_type               (BusContext       *context);
-const char*      bus_context_get_address            (BusContext       *context);
-BusRegistry*     bus_context_get_registry           (BusContext       *context);
-BusConnections*  bus_context_get_connections        (BusContext       *context);
-BusActivation*   bus_context_get_activation         (BusContext       *context);
-DBusLoop*        bus_context_get_loop               (BusContext       *context);
-dbus_bool_t      bus_context_allow_user             (BusContext       *context,
-                                                     unsigned long     uid);
-BusClientPolicy* bus_context_create_client_policy   (BusContext       *context,
-                                                     DBusConnection   *connection);
-int              bus_context_get_activation_timeout (BusContext       *context);
-dbus_bool_t      bus_context_check_security_policy  (BusContext       *context,
-                                                     DBusConnection   *sender,
-                                                     DBusConnection   *recipient,
-                                                     DBusMessage      *message,
-                                                     DBusError        *error);
+BusContext*       bus_context_new                    (const DBusString *config_file,
+                                                      int               print_addr_fd,
+                                                      DBusError        *error);
+void              bus_context_shutdown               (BusContext       *context);
+void              bus_context_ref                    (BusContext       *context);
+void              bus_context_unref                  (BusContext       *context);
+const char*       bus_context_get_type               (BusContext       *context);
+const char*       bus_context_get_address            (BusContext       *context);
+BusRegistry*      bus_context_get_registry           (BusContext       *context);
+BusConnections*   bus_context_get_connections        (BusContext       *context);
+BusActivation*    bus_context_get_activation         (BusContext       *context);
+DBusLoop*         bus_context_get_loop               (BusContext       *context);
+DBusUserDatabase* bus_context_get_user_database      (BusContext       *context);
+dbus_bool_t       bus_context_allow_user             (BusContext       *context,
+                                                      unsigned long     uid);
+BusClientPolicy*  bus_context_create_client_policy   (BusContext       *context,
+                                                      DBusConnection   *connection);
+int               bus_context_get_activation_timeout (BusContext       *context);
+dbus_bool_t       bus_context_check_security_policy  (BusContext       *context,
+                                                      DBusConnection   *sender,
+                                                      DBusConnection   *recipient,
+                                                      DBusMessage      *message,
+                                                      DBusError        *error);
 
 
 #endif /* BUS_BUS_H */