summaryrefslogtreecommitdiff
path: root/source3/lib/serverid.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-16 15:13:53 +1100
committerGünther Deschner <gd@samba.org>2011-02-17 16:02:19 +0100
commit09c4a5cd9bc3f46bbc90e86f0155ef4080d1a3ec (patch)
treeaa5c5a928f792c251eb72c81f5702f5807d8c5bd /source3/lib/serverid.c
parent6840549123c9152a9fbe614a2f9d0de758318660 (diff)
downloadsamba-09c4a5cd9bc3f46bbc90e86f0155ef4080d1a3ec.tar.gz
samba-09c4a5cd9bc3f46bbc90e86f0155ef4080d1a3ec.tar.bz2
samba-09c4a5cd9bc3f46bbc90e86f0155ef4080d1a3ec.zip
s3-cluster Always fill in the clustering vnn element
This avoids this structure being partially uninitialised. Adnrew Bartlett
Diffstat (limited to 'source3/lib/serverid.c')
-rw-r--r--source3/lib/serverid.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index ded72981ec..a8cdcfa2a9 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -23,9 +23,7 @@
struct serverid_key {
pid_t pid;
-#ifdef CLUSTER_SUPPORT
uint32_t vnn;
-#endif
};
struct serverid_data {
@@ -71,9 +69,7 @@ static void serverid_fill_key(const struct server_id *id,
{
ZERO_STRUCTP(key);
key->pid = id->pid;
-#ifdef CLUSTER_SUPPORT
key->vnn = id->vnn;
-#endif
}
bool serverid_register(const struct server_id id, uint32_t msg_flags)
@@ -276,9 +272,7 @@ static bool serverid_rec_parse(const struct db_record *rec,
memcpy(&data, rec->value.dptr, sizeof(data));
id->pid = key.pid;
-#ifdef CLUSTER_SUPPORT
id->vnn = key.vnn;
-#endif
id->unique_id = data.unique_id;
*msg_flags = data.msg_flags;
return true;