From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25564 invoked by alias); 2 Jun 2008 04:45:32 -0000 Received: (qmail 25533 invoked by uid 9702); 2 Jun 2008 04:45:31 -0000 Date: Mon, 02 Jun 2008 04:45:00 -0000 Message-ID: <20080602044531.25516.qmail@sourceware.org> From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.03.03-1-gd4a28c3 X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 8a7314ea3f3d30cbf10b127fc5516a078d000adc X-Git-Newrev: d4a28c3135cf4a06dad23c10f4228be0880bcb4a 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/msg00409.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=d4a28c3135cf4a06dad23c10f4228be0880bcb4a The branch, STABLE2 has been updated via d4a28c3135cf4a06dad23c10f4228be0880bcb4a (commit) from 8a7314ea3f3d30cbf10b127fc5516a078d000adc (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 d4a28c3135cf4a06dad23c10f4228be0880bcb4a Author: Fabio M. Di Nitto Date: Mon Jun 2 06:45:01 2008 +0200 [CMAN] Fix cman_tool node name override Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: cman/daemon/cmanccs.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cman/daemon/cmanccs.c b/cman/daemon/cmanccs.c index 2bfc299..78a237b 100644 --- a/cman/daemon/cmanccs.c +++ b/cman/daemon/cmanccs.c @@ -564,9 +564,9 @@ static int get_ccs_join_info(void) /* our nodename */ if (nodename_env) { int ret; - ret = snprintf(path, sizeof(path), NODE_NAME_PATH_BYNAME, nodename); + ret = snprintf(path, sizeof(path), NODE_NAME_PATH_BYNAME, nodename_env); if (ret < 0 || (size_t) ret >= sizeof(path)) { - log_printf(LOG_ERR, "Overridden node name %s is too long", nodename); + log_printf(LOG_ERR, "Overridden node name %s is too long", nodename_env); write_cman_pipe("Overridden node name is too long"); error = -E2BIG; goto out; @@ -576,11 +576,12 @@ static int get_ccs_join_info(void) if (!error) { free(str); } else { - log_printf(LOG_ERR, "Overridden node name %s is not in CCS", nodename); + log_printf(LOG_ERR, "Overridden node name %s is not in CCS", nodename_env); write_cman_pipe("Overridden node name is not in CCS"); error = -ENOENT; goto out; } + strcpy(nodename, nodename_env); } else { struct utsname utsname; hooks/post-receive -- Cluster Project