ctdb-tools: No longer honour CTDB_NODES environment variable

Signed-off-by: Martin Schwenke <[email protected]> Reviewed-by: Amitay Isaacs <[email protected]>
miz-take · Mar 19, 2018 · dedc9ea · dedc9ea
1 parent 6cf861a
commit dedc9ea
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
@@ -479,17 +479,14 @@ static struct ctdb_node_map *read_nodes_file(TALLOC_CTX *mem_ctx, uint32_t pnn)
 	struct ctdb_node_map *nodemap;
 	const char *nodes_list = NULL;
 
-	nodes_list = getenv("CTDB_NODES");
+	const char *basedir = getenv("CTDB_BASE");
+	if (basedir == NULL) {
+		basedir = CTDB_ETCDIR;
+	}
+	nodes_list = talloc_asprintf(mem_ctx, "%s/nodes", basedir);
 	if (nodes_list == NULL) {
-		const char *basedir = getenv("CTDB_BASE");
-		if (basedir == NULL) {
-			basedir = CTDB_ETCDIR;
-		}
-		nodes_list = talloc_asprintf(mem_ctx, "%s/nodes", basedir);
-		if (nodes_list == NULL) {
-			fprintf(stderr, "Memory allocation error\n");
-			return NULL;
-		}
+		fprintf(stderr, "Memory allocation error\n");
+		return NULL;
 	}
 
 	nodemap = ctdb_read_nodes_file(mem_ctx, nodes_list);