[Cluster-devel] cluster ccs/ccs_tool/update.c cman/init.d/cman

[cfeist at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	cfeist at sourceware.org	2006-09-18 15:49:01

Modified files:
	ccs/ccs_tool   : update.c 
	cman/init.d    : cman 

Log message:
	- Fix for bz #206325, ccs should not be started with the '-X' option & return
	the socket file descriptor instead of '0' when returning from ccs_open.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/update.c.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/cman.diff?cvsroot=cluster&r1=1.21&r2=1.22

--- cluster/ccs/ccs_tool/update.c	2006/04/21 16:47:11	1.7
+++ cluster/ccs/ccs_tool/update.c	2006/09/18 15:49:01	1.8
@@ -649,14 +649,15 @@
 static int ccs_open(cman_node_t node, uint16_t port, int timeout)
 {
   struct in_addr *addr;
+  int fd;
 
   addr = &(((struct sockaddr_in *)&(node.cn_address.cna_address))->sin_addr);
 
-  if (ipv4_connect(addr, port, timeout) < 0) {
+  if ((fd = ipv4_connect(addr, port, timeout)) < 0) {
     return -1;
   }
 
-  return 0;
+  return fd;
 }
 
 
--- cluster/cman/init.d/cman	2006/08/31 18:00:03	1.21
+++ cluster/cman/init.d/cman	2006/09/18 15:49:01	1.22
@@ -8,7 +8,7 @@
 # Provides:
 ### END INIT INFO
 . /etc/init.d/functions
-CCSD_OPTS=-X
+CCSD_OPTS=
 # CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
 #     before giving up.  If CMAN_CLUSTER_TIMEOUT is positive, then we will
 #     wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing when