Fix a few more breakages from our recent changes to the server_id

[samba.git] / source4 / cluster / cluster.h

diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h
index d182bf5526211d6dd3d75570c420c49a04ac4d27..7545757f2cfb3b60ae5ddd03b51cd52207c0c86b 100644 (file)
--- a/source4/cluster/cluster.h
+++ b/source4/cluster/cluster.h
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __CLUSTER_H__
@@ -26,7 +25,9 @@
 /*
   test for same cluster id
 */
-#define cluster_id_equal(id1, id2) ((id1)->id == (id2)->id && (id1)->node == (id2)->node)
+#define cluster_id_equal(id_1, id_2) ((id_1)->id == (id_2)->id \
+                                   && (id_1)->id2 == (id_2)->id2 \
+                                   && (id_1)->node == (id_2)->node)
 
 /*
   test for same cluster node
@@ -37,13 +38,13 @@ struct messaging_context;
 typedef void (*cluster_message_fn_t)(struct messaging_context *, DATA_BLOB);
 
 /* prototypes */
-struct server_id cluster_id(uint32_t id);
+struct server_id cluster_id(uint64_t id, uint32_t id2);
 const char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id);
-struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, const char *dbname, int flags);
+struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags);
 void *cluster_backend_handle(void);
 
 NTSTATUS cluster_message_init(struct messaging_context *msg, struct server_id server,
                              cluster_message_fn_t handler);
-NTSTATUS cluster_message_send(struct server_id server, uint32_t msg_type, DATA_BLOB *data);
+NTSTATUS cluster_message_send(struct server_id server, DATA_BLOB *data);
 
 #endif