diff options
author | Stefan Metzmacher <metze@samba.org> | 2009-01-31 23:43:43 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2009-02-01 00:17:19 +0100 |
commit | 15239f742cfcebe0bce4dbf4cb74eb2e8dcab364 (patch) | |
tree | af77939b30f4d446445389d5217945e9f98dfc10 /source4/kdc/kdc.c | |
parent | 06a24497dc167853bbd2171e50945595a62c5623 (diff) | |
download | samba-15239f742cfcebe0bce4dbf4cb74eb2e8dcab364.tar.gz samba-15239f742cfcebe0bce4dbf4cb74eb2e8dcab364.tar.bz2 samba-15239f742cfcebe0bce4dbf4cb74eb2e8dcab364.zip |
s4:kdc: avoid c++ reserved word 'private'
metze
Diffstat (limited to 'source4/kdc/kdc.c')
-rw-r--r-- | source4/kdc/kdc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index c11c4a6eee..db824db86c 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -200,9 +200,9 @@ static void kdc_recv_handler(struct kdc_socket *kdc_socket) handle fd events on a KDC socket */ static void kdc_socket_handler(struct tevent_context *ev, struct tevent_fd *fde, - uint16_t flags, void *private) + uint16_t flags, void *private_data) { - struct kdc_socket *kdc_socket = talloc_get_type(private, struct kdc_socket); + struct kdc_socket *kdc_socket = talloc_get_type(private_data, struct kdc_socket); if (flags & EVENT_FD_WRITE) { kdc_send_handler(kdc_socket); } @@ -219,9 +219,9 @@ static void kdc_tcp_terminate_connection(struct kdc_tcp_connection *kdcconn, con /* receive a full packet on a KDC connection */ -static NTSTATUS kdc_tcp_recv(void *private, DATA_BLOB blob) +static NTSTATUS kdc_tcp_recv(void *private_data, DATA_BLOB blob) { - struct kdc_tcp_connection *kdcconn = talloc_get_type(private, + struct kdc_tcp_connection *kdcconn = talloc_get_type(private_data, struct kdc_tcp_connection); NTSTATUS status = NT_STATUS_UNSUCCESSFUL; TALLOC_CTX *tmp_ctx = talloc_new(kdcconn); @@ -293,9 +293,10 @@ static void kdc_tcp_recv_handler(struct stream_connection *conn, uint16_t flags) /* called on a tcp recv error */ -static void kdc_tcp_recv_error(void *private, NTSTATUS status) +static void kdc_tcp_recv_error(void *private_data, NTSTATUS status) { - struct kdc_tcp_connection *kdcconn = talloc_get_type(private, struct kdc_tcp_connection); + struct kdc_tcp_connection *kdcconn = talloc_get_type(private_data, + struct kdc_tcp_connection); kdc_tcp_terminate_connection(kdcconn, nt_errstr(status)); } |