[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>

diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 7f6fc9e12b15cb02cbbddc48913e0c3389347c48..f15ede0c056a1d1004f3f5503176d62eb459d813 100644 (file)
--- 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;