From: Martin Schwenke <martin@meltin.net>
Date: Wed, 14 Mar 2018 04:25:34 +0000 (+1100)
Subject: ctdb-tools: Drop testing hook from ctdb tool
X-Git-Tag: talloc-2.1.12~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1eac09dd36ef5d5f3f861cfb37d96f86eebe5ed;p=thirdparty%2Fsamba.git

ctdb-tools: Drop testing hook from ctdb tool

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index c3b2dcb23dd..6110cc12dbe 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -477,18 +477,9 @@ static struct ctdb_node_map *ctdb_read_nodes_file(TALLOC_CTX *mem_ctx,
 static struct ctdb_node_map *read_nodes_file(TALLOC_CTX *mem_ctx, uint32_t pnn)
 {
 	struct ctdb_node_map *nodemap;
-	char *nodepath;
 	const char *nodes_list = NULL;
 
-	if (pnn != CTDB_UNKNOWN_PNN) {
-		nodepath = talloc_asprintf(mem_ctx, "CTDB_NODES_%u", pnn);
-		if (nodepath != NULL) {
-			nodes_list = getenv(nodepath);
-		}
-	}
-	if (nodes_list == NULL) {
-		nodes_list = getenv("CTDB_NODES");
-	}
+	nodes_list = getenv("CTDB_NODES");
 	if (nodes_list == NULL) {
 		const char *basedir = getenv("CTDB_BASE");
 		if (basedir == NULL) {