dbus/dbus dbus-sysdeps-util.c, 1.5, 1.6 dbus-sysdeps.c, 1.100, 1.101 dbus-userdb.c, 1.17, 1.18

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv27443/dbus

Modified Files:
	dbus-sysdeps-util.c dbus-sysdeps.c dbus-userdb.c 
Log Message:
2006-02-24  John (J5) Palmieri <johnp at 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


Index: dbus-sysdeps-util.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dbus-sysdeps-util.c	8 Jul 2005 14:36:22 -0000	1.5
+++ dbus-sysdeps-util.c	24 Feb 2006 16:13:08 -0000	1.6
@@ -680,17 +680,6 @@
   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 */
 
 /**

Index: dbus-sysdeps.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- dbus-sysdeps.c	22 Nov 2005 20:37:00 -0000	1.100
+++ dbus-sysdeps.c	24 Feb 2006 16:13:08 -0000	1.101
@@ -1754,6 +1754,17 @@
 }
 
 /**
+ * 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.
  *

Index: dbus-userdb.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-userdb.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dbus-userdb.c	22 Mar 2005 17:57:27 -0000	1.17
+++ dbus-userdb.c	24 Feb 2006 16:13:08 -0000	1.18
@@ -61,7 +61,7 @@
   if (info == NULL) /* hash table will pass NULL */
     return;
 
-  _dbus_group_info_free_allocated (info);
+  _dbus_group_info_free (info);
   dbus_free (info);
 }