diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | dbus/dbus-sysdeps-util.c | 11 | ||||
-rw-r--r-- | dbus/dbus-sysdeps.c | 11 | ||||
-rw-r--r-- | dbus/dbus-userdb.c | 2 |
4 files changed, 23 insertions, 12 deletions
@@ -1,3 +1,14 @@ +2006-02-24 John (J5) Palmieri <johnp@redhat.com> + + * patch from Sjoerd Simons <sjoerd at debian.org>: + + * dbus/dbus-sysdeps-util.c (_dbus_group_info_free): Moved to + dbus/dbus-sysdeps.c + + * dbus/dbus-userdb.c (_dbus_group_info_free_allocated): Don't + call _dbus_group_info_free_allocated which causes infinite loop, + correctly call _dbus_group_info_free + 2006-02-20 Thiago Macieira <thiago.macieira@trolltech.com> * qt/qdbusinterface_p.h: diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c index 9964b56f..72db5d34 100644 --- a/dbus/dbus-sysdeps-util.c +++ b/dbus/dbus-sysdeps-util.c @@ -680,17 +680,6 @@ _dbus_group_info_fill_gid (DBusGroupInfo *info, return fill_group_info (info, gid, NULL, error); } -/** - * Frees the members of info (but not info itself). - * - * @param info the group info - */ -void -_dbus_group_info_free (DBusGroupInfo *info) -{ - dbus_free (info->groupname); -} - /** @} */ /* End of DBusInternalsUtils functions */ /** diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index 030d0801..e8bd9b71 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -1754,6 +1754,17 @@ _dbus_user_info_free (DBusUserInfo *info) } /** + * Frees the members of info (but not info itself). + * + * @param info the group info + */ +void +_dbus_group_info_free (DBusGroupInfo *info) +{ + dbus_free (info->groupname); +} + +/** * Sets fields in DBusCredentials to DBUS_PID_UNSET, * DBUS_UID_UNSET, DBUS_GID_UNSET. * diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c index 83a5769f..9efc4653 100644 --- a/dbus/dbus-userdb.c +++ b/dbus/dbus-userdb.c @@ -61,7 +61,7 @@ _dbus_group_info_free_allocated (DBusGroupInfo *info) if (info == NULL) /* hash table will pass NULL */ return; - _dbus_group_info_free_allocated (info); + _dbus_group_info_free (info); dbus_free (info); } |