diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-02 10:53:18 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:07 +0200 |
| commit | 4c8de5ab135d7d8462e264f616225122945c7682 (patch) | |
| tree | 17ab048dcdf8f6a112f92604268fa609941a19d1 /source4/cluster | |
| parent | b0578d8a180d76bc7884b116a0081973a73b78cf (diff) | |
| download | samba-4c8de5ab135d7d8462e264f616225122945c7682.tar.gz samba-4c8de5ab135d7d8462e264f616225122945c7682.tar.bz2 samba-4c8de5ab135d7d8462e264f616225122945c7682.zip | |
s4-cluster Rename server_id.node -> vnn to match Samba3
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); } |