From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20556 invoked by alias); 14 Apr 2008 16:39:42 -0000 Received: (qmail 20519 invoked by uid 9476); 14 Apr 2008 16:39:42 -0000 Date: Mon, 14 Apr 2008 16:39:00 -0000 Message-ID: <20080414163942.20496.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-44-g1d56fb4 X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: e835ef061174e2ab6ecd663145121bc454c9790c X-Git-Newrev: 1d56fb441d78faf375eb26a84e775cc8dde7e705 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/msg00085.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=1d56fb441d78faf375eb26a84e775cc8dde7e705 The branch, RHEL5 has been updated via 1d56fb441d78faf375eb26a84e775cc8dde7e705 (commit) via 9272ffea31005732c4f680e639828de1626f5a95 (commit) from e835ef061174e2ab6ecd663145121bc454c9790c (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 1d56fb441d78faf375eb26a84e775cc8dde7e705 Merge: 9272ffea31005732c4f680e639828de1626f5a95 e835ef061174e2ab6ecd663145121bc454c9790c Author: Lon Hohberger Date: Mon Apr 14 12:39:30 2008 -0400 Merge branch 'RHEL5' of ssh://sources.redhat.com/git/cluster into rhel5 commit 9272ffea31005732c4f680e639828de1626f5a95 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