diff -ruNp dbus-1.1.20~/dbus/dbus-userdb-util.c dbus-1.1.20/dbus/dbus-userdb-util.c
--- dbus-1.1.20~/dbus/dbus-userdb-util.c	2008-04-18 20:49:13.000000000 +0100
+++ dbus-1.1.20/dbus/dbus-userdb-util.c	2008-04-18 20:42:47.000000000 +0100
@@ -223,7 +223,7 @@ _dbus_user_database_lookup_group (DBusUs
         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 -ruNp dbus-1.1.20~/dbus/dbus-userdb.c dbus-1.1.20/dbus/dbus-userdb.c
--- dbus-1.1.20~/dbus/dbus-userdb.c	2008-04-18 20:49:07.000000000 +0100
+++ dbus-1.1.20/dbus/dbus-userdb.c	2008-04-18 20:42:52.000000000 +0100
@@ -143,7 +143,7 @@ _dbus_user_database_lookup (DBusUserData
         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