sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

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

Browse Source 
structure.  The BASE-TORTURE test found this problem - caused because
the messaging path was not unique.

If we didn't use a macro for cluster_id_equal(), we could make it
opaque, and avoid this...

Andrew Bartlett
(This used to be commit c3387545c5)
This commit is contained in:
Andrew Bartlett 2008-02-04 23:04:35 +11:00
parent 0f8eeb81ec
commit 7e15e09f67
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/cluster/cluster.h
View File

@ -25,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

4
source4/lib/messaging/messaging.c
View File

@ -121,8 +121,8 @@ static NTSTATUS irpc_uptime(struct irpc_message *msg,
*/
static char *messaging_path(struct messaging_context *msg, struct server_id server_id)
{
return talloc_asprintf(msg, "%s/msg.%u.%u", msg->base_path,
(unsigned)server_id.node, (unsigned)server_id.id);
return talloc_asprintf(msg, "%s/msg.%s", msg->base_path,
cluster_id_string(msg, server_id));
}
/*