From: cfeist@sourceware.org <cfeist@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster ccs/ccs_tool/update.c cman/init.d/cman
Date: 18 Sep 2006 15:49:01 -0000 [thread overview]
Message-ID: <20060918154901.24860.qmail@sourceware.org> (raw)
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
reply other threads:[~2006-09-18 15:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060918154901.24860.qmail@sourceware.org \
--to=cfeist@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).