dbus/dbus dbus-userdb.c,1.15,1.16 dbus-userdb-util.c,1.4,1.5

[Colin Walters]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv19973/dbus

Modified Files:
	dbus-userdb.c dbus-userdb-util.c 
Log Message:
2005-03-17  Tom Parker  <palfrey at 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.


Index: dbus-userdb.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-userdb.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dbus-userdb.c	17 Mar 2005 23:10:44 -0000	1.15
+++ dbus-userdb.c	17 Mar 2005 23:13:38 -0000	1.16
@@ -96,7 +96,7 @@
   if (info)
     {
       _dbus_verbose ("Using cache for UID "DBUS_UID_FORMAT" information\n",
-                     uid);
+                     info->uid);
       return info;
     }
   else

Index: dbus-userdb-util.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-userdb-util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-userdb-util.c	17 Mar 2005 23:10:44 -0000	1.4
+++ dbus-userdb-util.c	17 Mar 2005 23:13:38 -0000	1.5
@@ -203,7 +203,7 @@
   if (info)
     {
       _dbus_verbose ("Using cache for GID "DBUS_GID_FORMAT" information\n",
-                     gid);
+                     info->gid);
       return info;
     }
   else