From: Colin Walters <walters@verbum.org>
Date: Thu, 17 Mar 2005 23:13:38 +0000 (+0000)
Subject: 2005-03-17  Tom Parker  <palfrey@tevp.net>
X-Git-Tag: dbus-0.32.0~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49c64e69deb118555bba63318e7f29a559685f11;p=thirdparty%2Fdbus.git

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 934ebbba3..ef423f760 100644
--- 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 347632195..bd9c2e352 100644
--- 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 7a71fe9b7..f1317aa9b 100644
--- 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