 ===================================================================
 RCS file: /cvs/lvm2/LVM2/daemons/clvmd/clvmd.c,v
 retrieving revision 1.25
-diff -u -p -r1.25 clvmd.c
+diff -w -u -p -r1.25 clvmd.c
 --- daemons/clvmd/clvmd.c	9 Aug 2005 10:39:57 -0000	1.25
-+++ daemons/clvmd/clvmd.c	21 Sep 2005 08:05:26 -0000
++++ daemons/clvmd/clvmd.c	24 Feb 2006 13:05:59 -0000
 @@ -508,6 +508,9 @@ static void main_loop(int local_sock, in
  		struct timeval tv = { cmd_timeout, 0 };
  		int quorate = clops->is_quorate();

-	do {
-		len = sendmsg(cluster_sock, &msg, 0);
-		if (len < 0 && errno != EAGAIN)
-			log_error(errtext);
-
-	} while (len == -1 && errno == EAGAIN);
-	return len;
+	DEBUGLOG("sending message to node %d\n", nodeid);
+	if (cman_send_data(c_handle, buf, msglen, 0, CLUSTER_PORT_CLVMD, nodeid) <= 0)
+	{
+		log_error(errtext);
+	}
+	return msglen;
 }

 	CFLAGS += -DUSE_CMAN
 endif
 
 TARGETS = \
 	clvmd
 
-LVMLIBS = -llvm
+LVMLIBS = -llvm -lpthread
 
 ifeq ("@DMEVENTD@", "yes")
-	LVMLIBS += -ldevmapper-event -lpthread
+	LVMLIBS += -ldevmapper-event
 endif
  
 ifeq ("@DEVMAPPER@", "yes")
Index: daemons/clvmd/clvmd-cman.c
===================================================================
RCS file: /cvs/lvm2/LVM2/daemons/clvmd/clvmd-cman.c,v
retrieving revision 1.11
diff -w -u -p -r1.11 clvmd-cman.c
--- daemons/clvmd/clvmd-cman.c	7 Mar 2005 17:03:44 -0000	1.11
+++ daemons/clvmd/clvmd-cman.c	24 Feb 2006 13:05:59 -0000
@@ -46,19 +46,24 @@
 
 #define LOCKSPACE_NAME "clvmd"
