ctdb-tools: No longer honour CTDB_NODES environment variable

[martins/samba.git] / ctdb / tools / ctdb.c

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 6110cc12dbe2189d7e159c53d7f3af3d8d856314..0efd71e437fe039cd2bafff6e2628e17f1c62917 100644 (file)
--- 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);