diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/cluster | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/cluster')
| -rw-r--r-- | source4/cluster/cluster_private.h | 2 | ||||
| -rw-r--r-- | source4/cluster/local.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/cluster/cluster_private.h b/source4/cluster/cluster_private.h index 79394b46db..e57c983ed0 100644 --- a/source4/cluster/cluster_private.h +++ b/source4/cluster/cluster_private.h @@ -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); diff --git a/source4/cluster/local.c b/source4/cluster/local.c index f36a06c9b6..96d1d53d4a 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -103,7 +103,7 @@ static struct cluster_ops cluster_local_ops = { .backend_handle = local_backend_handle, .message_init = local_message_init, .message_send = local_message_send, - .private = NULL + .private_data = NULL }; void cluster_local_init(void) |