Merge branch 'master' of ssh://git.samba.org/data/git/samba

[ira/wip.git] / source4 / cluster / cluster_private.h

diff --git a/source4/cluster/cluster_private.h b/source4/cluster/cluster_private.h
index 1c895b8640d54e1d46f323280fd813c5c4d6ade5..e57c983ed0cd9b2495b91af73352ee3a44805754 100644 (file)
--- a/source4/cluster/cluster_private.h
+++ b/source4/cluster/cluster_private.h
@@ -23,7 +23,7 @@
 #define _CLUSTER_PRIVATE_H_
 
 struct cluster_ops {
-       struct server_id (*cluster_id)(struct cluster_ops *ops, uint32_t id);
+       struct server_id (*cluster_id)(struct cluster_ops *ops, uint64_t id, uint32_t id2);
        const char *(*cluster_id_string)(struct cluster_ops *ops, 
                                         TALLOC_CTX *, struct server_id );
        struct tdb_wrap *(*cluster_tdb_tmp_open)(struct cluster_ops *,
@@ -36,7 +36,7 @@ struct cluster_ops {
                                 cluster_message_fn_t handler);
        NTSTATUS (*message_send)(struct cluster_ops *ops,
                                 struct server_id server, DATA_BLOB *data);     
-       void *private; /* backend state */
+       void *private_data; /* backend state */
 };
 
 void cluster_set_ops(struct cluster_ops *new_ops);