2005-03-17 Tom Parker <palfrey@tevp.net>

	* dbus/dbus-userdb.c (_dbus_user_database_lookup): Don't
	print DBUS_UID_UNSET; instead print passed username.  Also
	be sure to actually use gid looked up in cache.

	* dbus/dbus-userdb-util.c (_dbus_user_database_lookup_group): Ditto
	for DBUS_GID_UNSET and groupname.

diff --git a/ChangeLog b/ChangeLog
index 934ebbb..ef423f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2005-03-17  Tom Parker  <palfrey@tevp.net>
 
        * dbus/dbus-userdb.c (_dbus_user_database_lookup): Don't
-       print DBUS_UID_UNSET; instead print passed username.
+       print DBUS_UID_UNSET; instead print passed username.  Also
+       be sure to actually use gid looked up in cache.
        
        * dbus/dbus-userdb-util.c (_dbus_user_database_lookup_group): Ditto
        for DBUS_GID_UNSET and groupname.

diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index 3476321..bd9c2e3 100644 (file)
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -203,7 +203,7 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
   if (info)
     {
       _dbus_verbose ("Using cache for GID "DBUS_GID_FORMAT" information\n",
-                     gid);
+                     info->gid);
       return info;
     }
   else

diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 7a71fe9..f1317aa 100644 (file)
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -96,7 +96,7 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
   if (info)
     {
       _dbus_verbose ("Using cache for UID "DBUS_UID_FORMAT" information\n",
-                     uid);
+                     info->uid);
       return info;
     }
   else