From: Martin Schwenke <martin@meltin.net>
Date: Tue, 14 Jul 2020 04:22:15 +0000 (+1000)
Subject: ctdb-recoverd: Correctly find nodemap entry for pnn
X-Git-Tag: talloc-2.3.2~995
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3654e416770cc7521dcc3c15976daeba37023304;p=thirdparty%2Fsamba.git

ctdb-recoverd: Correctly find nodemap entry for pnn

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

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 71be10d81dc..be786adbc6c 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -438,18 +438,24 @@ static int update_flags_on_all_nodes(struct ctdb_recoverd *rec,
 	struct ctdb_node_flag_change c;
 	TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
 	uint32_t *nodes;
+	uint32_t i;
 	int ret;
 
 	nodemap = rec->nodemap;
 
-	if (pnn >= nodemap->num) {
+	for (i = 0; i < nodemap->num; i++) {
+		if (pnn == nodemap->nodes[i].pnn) {
+			break;
+		}
+	}
+	if (i >= nodemap->num) {
 		DBG_ERR("Nodemap does not contain node %d\n", pnn);
 		talloc_free(tmp_ctx);
 		return -1;
 	}
 
 	c.pnn       = pnn;
-	c.old_flags = nodemap->nodes[pnn].flags;
+	c.old_flags = nodemap->nodes[i].flags;
 	c.new_flags = c.old_flags;
 	c.new_flags |= flags;
 	c.new_flags &= flags;