Cluster Project branch, master, updated. cluster-2.99.06-77-gbd0b1b5

Cluster Project branch, master, updated. cluster-2.99.06-77-gbd0b1b5

[ccaulfield]

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=bd0b1b52a6061471a4bf6cc224084ef0291f360f

The branch, master has been updated
       via  bd0b1b52a6061471a4bf6cc224084ef0291f360f (commit)
      from  8b939cb1231ad3ff267e0d94f4937edfe2a54908 (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 bd0b1b52a6061471a4bf6cc224084ef0291f360f
Author: Christine Caulfield <ccaulfie@redhat.com>
Date:   Mon Jul 28 14:16:34 2008 +0100

    [CMAN] Fix overridden node names
    
    cman-tool join -n <nodename> was failing because it assumed
    an old object context. It now uses the nodeslist functions
    I wrote for the purpose.
    
    Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 cman/daemon/cman-preconfig.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 7f6fc9e..f15ede0 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -514,9 +514,7 @@ static int get_nodename(struct objdb_iface_ver0 *objdb)
 
 			strcpy(nodename, nodename_env);
 
-			if (objdb->object_find(object_handle,
-					       nodename, strlen(nodename),
-					       &node_object_handle) != 0) {
+			if (!(node_object_handle = nodelist_byname(objdb, cluster_parent_handle, nodename))) {
 				sprintf(error_reason, "Overridden node name %s is not in CCS", nodename);
 				write_cman_pipe("Overridden node name is not in CCS");
 				error = -1;


hooks/post-receive
--
Cluster Project