dbus/dbus dbus-userdb.c,1.14,1.15 dbus-userdb-util.c,1.3,1.4

[Colin Walters]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv19764/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.
	
	* 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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dbus-userdb.c	17 Jan 2005 03:53:40 -0000	1.14
+++ dbus-userdb.c	17 Mar 2005 23:10:44 -0000	1.15
@@ -101,8 +101,12 @@
     }
   else
     {
-      _dbus_verbose ("No cache for UID "DBUS_UID_FORMAT"\n",
-                     uid);
+      if (uid != DBUS_UID_UNSET)
+	_dbus_verbose ("No cache for UID "DBUS_UID_FORMAT"\n",
+		       uid);
+      else
+	_dbus_verbose ("No cache for user \"%s\"\n",
+		       _dbus_string_get_const_data (username));
       
       info = dbus_new0 (DBusUserInfo, 1);
       if (info == NULL)

Index: dbus-userdb-util.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-userdb-util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbus-userdb-util.c	14 Feb 2005 19:07:29 -0000	1.3
+++ dbus-userdb-util.c	17 Mar 2005 23:10:44 -0000	1.4
@@ -208,8 +208,12 @@
     }
   else
     {
-      _dbus_verbose ("No cache for GID "DBUS_GID_FORMAT"\n",
-                     gid);
+      if (gid != DBUS_GID_UNSET)
+	_dbus_verbose ("No cache for GID "DBUS_GID_FORMAT"\n",
+		       gid);
+      else
+	_dbus_verbose ("No cache for groupname \"%s\"\n",
+		       _dbus_string_get_const_data (groupname));
       
       info = dbus_new0 (DBusGroupInfo, 1);
       if (info == NULL)