diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-03-14 15:31:36 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-03-19 02:23:20 +0100 |
| commit | dedc9eab92140d328550fcb76c6504677630e841 (patch) | |
| tree | ba004bf7a33eee8f13eff89ba8b783916cadb288 /ctdb/tools | |
| parent | 6cf861a544e19b6b9df839d470e49baafff1097d (diff) | |
| download | samba-dedc9eab92140d328550fcb76c6504677630e841.tar.gz | |
ctdb-tools: No longer honour CTDB_NODES environment variable
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tools')
| -rw-r--r-- | ctdb/tools/ctdb.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 6110cc12dbe..0efd71e437f 100644 --- 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); |