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

diff --git a/ChangeLog b/ChangeLog
index ff17cef9b4a465b57085269df993715f40ac1208..de8641caf1a6a3b5926e7da98458a9dc55fba334 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 9964b56f7aa56d12356d8c85d755af5f49dc92db..72db5d34fc7aba4a54272ed137b5b1fd4ad7ac43 100644 (file)
--- 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 030d0801f8399650585d0b709be920a45c5ddc4b..e8bd9b711c7a08b98b50d88d2f0cc61d961e85f1 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -1753,6 +1753,17 @@ _dbus_user_info_free (DBusUserInfo *info)
   dbus_free (info->homedir);
 }
 
+/**
+ * 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 83a5769f7fdf4ad7b006cc5d6a6ac6bdb04bfbc8..9efc4653fd565dd8bcc8e3c6b9e19dbc91372ba1 100644 (file)
--- 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);
 }