From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19773 invoked by alias); 14 Apr 2008 16:38:05 -0000 Received: (qmail 19741 invoked by uid 9476); 14 Apr 2008 16:38:05 -0000 Date: Mon, 14 Apr 2008 16:38:00 -0000 Message-ID: <20080414163805.19720.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL52, updated. cmirror_1_1_15-21-g0639b2d X-Git-Refname: refs/heads/RHEL52 X-Git-Reftype: branch X-Git-Oldrev: 4f5e3c542d1e08f3acfd61882437ec839e3658b0 X-Git-Newrev: 0639b2dfac1c2591c5fb444548d3a013a3bc230c Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00084.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0639b2dfac1c2591c5fb444548d3a013a3bc230c The branch, RHEL52 has been updated via 0639b2dfac1c2591c5fb444548d3a013a3bc230c (commit) from 4f5e3c542d1e08f3acfd61882437ec839e3658b0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0639b2dfac1c2591c5fb444548d3a013a3bc230c Author: Lon Hohberger Date: Mon Apr 14 12:38:00 2008 -0400 [fence] Fix #441737 - fence_node broken due to internal API change ----------------------------------------------------------------------- Summary of changes: fence/fence_node/fence_node.c | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 deletions(-) diff --git a/fence/fence_node/fence_node.c b/fence/fence_node/fence_node.c index 7ee2799..1a344b9 100644 --- a/fence/fence_node/fence_node.c +++ b/fence/fence_node/fence_node.c @@ -34,7 +34,7 @@ while (0) static char *prog_name; static int force; -int dispatch_fence_agent(int cd, char *victim); +int dispatch_fence_agent(char *victim, int force); static void print_usage(void) { @@ -52,7 +52,7 @@ static void print_usage(void) int main(int argc, char *argv[]) { - int cont = 1, optchar, error, cd; + int cont = 1, optchar, error; char *victim = NULL; prog_name = argv[0]; @@ -104,28 +104,15 @@ int main(int argc, char *argv[]) if (!victim) die("no node name specified"); - if (force) - cd = ccs_force_connect(NULL, 0); - else - cd = ccs_connect(); - openlog("fence_node", LOG_PID, LOG_USER); - if (cd < 0) { - syslog(LOG_ERR, "cannot connect to ccs %d\n", cd); - goto fail; - } - - error = dispatch_fence_agent(cd, victim); + error = dispatch_fence_agent(victim, force); if (error) - goto fail_ccs; + goto fail; syslog(LOG_NOTICE, "Fence of \"%s\" was successful\n", victim); - ccs_disconnect(cd); exit(EXIT_SUCCESS); - fail_ccs: - ccs_disconnect(cd); fail: syslog(LOG_ERR, "Fence of \"%s\" was unsuccessful\n", victim); exit(EXIT_FAILURE); hooks/post-receive -- Cluster Project