[Spread-cvs] commit: r351 - trunk/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2006-05-05 12:36:16 -0400 (Fri, 05 May 2006)
New Revision: 351

Modified:
   trunk/daemon/groups.c
Log:
Bug fix for G_compare_daemon_vs_set calling G_compare_proc_ids_by_conf incorrectly.



Modified: trunk/daemon/groups.c
===================================================================
--- trunk/daemon/groups.c	2006-04-19 17:55:21 UTC (rev 350)
+++ trunk/daemon/groups.c	2006-05-05 16:36:16 UTC (rev 351)
@@ -201,7 +201,14 @@
 	const daemon_members *db  = *(const daemon_members**) b;
         int                   cmp = G_compare_memb_ids(&da->memb_id, &db->memb_id);
 
-	return (cmp != 0 ? cmp : G_compare_proc_ids_by_conf(&da->proc_id, &db->proc_id));
+	if ( cmp == 0 ) {
+	        int32 * da_proc_id_ptr = &da->proc_id;
+	        int32 * db_proc_id_ptr = &db->proc_id;
+
+		cmp = G_compare_proc_ids_by_conf( &da_proc_id_ptr, &db_proc_id_ptr );
+	}
+
+	return cmp;
 }
 
 /* Compares two memb_ids.  Arbitrary, but deterministic.  A memb_id with a proc_id