Bug 15588: Fix typo in #ifdef for userdb cache (Scott James Remnant)

	* dbus/dbus-userdb-util.c, dbus/dbus-userdb.c: Correct name of
 	macro used in #ifdef block to match that defined by configure,
 	otherwise the userdb cache will never be enabled.

diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index 30d50832d69941915f8143ecbff964207a0a59ce..d03a7c7831f45ff00a4419bb1a982067241884ad 100644 (file)
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -223,7 +223,7 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
         gid = n;
     }
 
-#ifdef DBUS_ENABLE_USER_CACHE
+#ifdef DBUS_ENABLE_USERDB_CACHE
   if (gid != DBUS_GID_UNSET)
     info = _dbus_hash_table_lookup_ulong (db->groups, gid);
   else

diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 0e430b2b809160cb6c8690556698845b1ac32a20..03d263f4d57b031edd8136573a9179f41d8f6ece 100644 (file)
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -143,7 +143,7 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
         uid = n;
     }
 
-#ifdef DBUS_ENABLE_USER_CACHE  
+#ifdef DBUS_ENABLE_USERDB_CACHE  
   if (uid != DBUS_UID_UNSET)
     info = _dbus_hash_table_lookup_ulong (db->users, uid);
   else