summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-03-17 23:13:38 +0000
committerColin Walters <walters@verbum.org>2005-03-17 23:13:38 +0000
commit49c64e69deb118555bba63318e7f29a559685f11 (patch)
tree33a048d38676ccd562ec1e87c692a4c7c88f7c77
parentb651df55102ba0867ad5050f6942d9c04c87efd9 (diff)
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.
-rw-r--r--ChangeLog3
-rw-r--r--dbus/dbus-userdb-util.c2
-rw-r--r--dbus/dbus-userdb.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 934ebbba..ef423f76 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 34763219..bd9c2e35 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 7a71fe9b..f1317aa9 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