From 60bf9558682754eee076b79bacf0a9815c60b94b Mon Sep 17 00:00:00 2001
From: Tim Dijkstra <tim@famdijkstra.org>
Date: Tue, 12 Dec 2006 22:01:22 +0000
Subject: * configure.in: Added switch to disable user_database caching.

* dbus/dbus-userdb-util.c, dbus/dbus-userdb.c: Add ifdefs to
be able disable user_dabase caching.
---
 dbus/dbus-userdb-util.c | 5 ++++-
 dbus/dbus-userdb.c      | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'dbus')

diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index bd393a27..7b12de50 100644
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -234,7 +234,7 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
         gid = n;
     }
 
-
+#ifdef DBUS_ENABLE_USER_CACHE
   if (gid != DBUS_GID_UNSET)
     info = _dbus_hash_table_lookup_ulong (db->groups, gid);
   else
@@ -247,6 +247,9 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
       return info;
     }
   else
+#else
+  if (1)
+#endif
     {
       if (gid != DBUS_GID_UNSET)
 	_dbus_verbose ("No cache for GID "DBUS_GID_FORMAT"\n",
diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 1be3dda6..2aa395dc 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -118,11 +118,12 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
         uid = n;
     }
 
+#ifdef DBUS_ENABLE_USER_CACHE  
   if (uid != DBUS_UID_UNSET)
     info = _dbus_hash_table_lookup_ulong (db->users, uid);
   else
     info = _dbus_hash_table_lookup_string (db->users_by_name, _dbus_string_get_const_data (username));
-  
+
   if (info)
     {
       _dbus_verbose ("Using cache for UID "DBUS_UID_FORMAT" information\n",
@@ -130,6 +131,9 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
       return info;
     }
   else
+#else 
+  if (1)
+#endif
     {
       if (uid != DBUS_UID_UNSET)
 	_dbus_verbose ("No cache for UID "DBUS_UID_FORMAT"\n",
-- 
cgit