diff options
Diffstat (limited to 'source4/cluster')
| -rw-r--r-- | source4/cluster/cluster.h | 4 | ||||
| -rw-r--r-- | source4/cluster/local.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index d3ae929a5a..ad2f926596 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -29,12 +29,12 @@ */ #define cluster_id_equal(id_1, id_2) ((id_1)->pid == (id_2)->pid \ && (id_1)->id2 == (id_2)->id2 \ - && (id_1)->node == (id_2)->node) + && (id_1)->vnn == (id_2)->vnn) /* test for same cluster node */ -#define cluster_node_equal(id1, id2) ((id1)->node == (id2)->node) +#define cluster_node_equal(id1, id2) ((id1)->vnn == (id2)->vnn) struct messaging_context; typedef void (*cluster_message_fn_t)(struct messaging_context *, DATA_BLOB); diff --git a/source4/cluster/local.c b/source4/cluster/local.c index 17de77f41e..dc9f4f79fb 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -47,7 +47,7 @@ static struct server_id local_id(struct cluster_ops *ops, uint64_t pid, uint32_t static char *local_id_string(struct cluster_ops *ops, TALLOC_CTX *mem_ctx, struct server_id id) { - return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.node, (unsigned long long)id.pid, id.id2); + return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.vnn, (unsigned long long)id.pid, id.id2); } |