summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-06-21 15:46:34 +0200
committerMichael Adam <obnox@samba.org>2011-11-26 23:30:33 +0100
commit7a962685d3a774c8bcddfa02f7bb8f614c1a9014 (patch)
tree0371636435c2cec7e2390fd64e191c432fcaeb9b
parentedc6067339b3f40c2fb132a51ae5d2d54a18137c (diff)
downloadsamba-7a962685d3a774c8bcddfa02f7bb8f614c1a9014.tar.gz
samba-7a962685d3a774c8bcddfa02f7bb8f614c1a9014.tar.xz
samba-7a962685d3a774c8bcddfa02f7bb8f614c1a9014.zip
recoverd: let async_getcap_callback() also update ctdb->capabilities
metze (This used to be ctdb commit ef5b47d1183ee99c39ae63045a994d35255ac829)
-rw-r--r--ctdb/server/ctdb_recoverd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 7f7c25f7e0..fa4b6ba882 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -219,6 +219,10 @@ static void async_getcap_callback(struct ctdb_context *ctdb, uint32_t node_pnn,
if (node_pnn < ctdb->num_nodes) {
ctdb->nodes[node_pnn]->capabilities = *((uint32_t *)outdata.dptr);
}
+
+ if (node_pnn == ctdb->pnn) {
+ ctdb->capabilities = ctdb->nodes[node_pnn]->capabilities;
+ }
}
/*