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.

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

diff --git a/ChangeLog b/ChangeLog
index 5993d64..934ebbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+       
+       * dbus/dbus-userdb-util.c (_dbus_user_database_lookup_group): Ditto
+       for DBUS_GID_UNSET and groupname.
+
 2005-03-17  Colin Walters  <walters@verbum.org>
 
        * bus/print-introspect.c: Move to tools/.

diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index 3d51f71..3476321 100644 (file)
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -208,8 +208,12 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
     }
   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)

diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 85ee1b6..7a71fe9 100644 (file)
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -101,8 +101,12 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
     }
   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)