diff options
Diffstat (limited to 'source4/ldap_server/ldap_server.c')
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index ed8e6d3a2c..61ff387152 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -55,9 +55,9 @@ void ldapsrv_terminate_connection(struct ldapsrv_connection *conn, /* handle packet errors */ -static void ldapsrv_error_handler(void *private, NTSTATUS status) +static void ldapsrv_error_handler(void *private_data, NTSTATUS status) { - struct ldapsrv_connection *conn = talloc_get_type(private, + struct ldapsrv_connection *conn = talloc_get_type(private_data, struct ldapsrv_connection); ldapsrv_terminate_connection(conn, nt_errstr(status)); } @@ -132,10 +132,10 @@ static void ldapsrv_process_message(struct ldapsrv_connection *conn, /* decode/process data */ -static NTSTATUS ldapsrv_decode(void *private, DATA_BLOB blob) +static NTSTATUS ldapsrv_decode(void *private_data, DATA_BLOB blob) { NTSTATUS status; - struct ldapsrv_connection *conn = talloc_get_type(private, + struct ldapsrv_connection *conn = talloc_get_type(private_data, struct ldapsrv_connection); struct asn1_data *asn1 = asn1_init(conn); struct ldap_message *msg = talloc(conn, struct ldap_message); @@ -170,9 +170,9 @@ static NTSTATUS ldapsrv_decode(void *private, DATA_BLOB blob) static void ldapsrv_conn_idle_timeout(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, - void *private) + void *private_data) { - struct ldapsrv_connection *conn = talloc_get_type(private, struct ldapsrv_connection); + struct ldapsrv_connection *conn = talloc_get_type(private_data, struct ldapsrv_connection); ldapsrv_terminate_connection(conn, "Timeout. No requests after bind"); } @@ -183,7 +183,7 @@ static void ldapsrv_conn_idle_timeout(struct tevent_context *ev, void ldapsrv_recv(struct stream_connection *c, uint16_t flags) { struct ldapsrv_connection *conn = - talloc_get_type(c->private, struct ldapsrv_connection); + talloc_get_type(c->private_data, struct ldapsrv_connection); if (conn->limits.ite) { /* clean initial timeout if any */ talloc_free(conn->limits.ite); @@ -209,7 +209,7 @@ void ldapsrv_recv(struct stream_connection *c, uint16_t flags) static void ldapsrv_send(struct stream_connection *c, uint16_t flags) { struct ldapsrv_connection *conn = - talloc_get_type(c->private, struct ldapsrv_connection); + talloc_get_type(c->private_data, struct ldapsrv_connection); packet_queue_run(conn->packet); } @@ -217,9 +217,9 @@ static void ldapsrv_send(struct stream_connection *c, uint16_t flags) static void ldapsrv_conn_init_timeout(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, - void *private) + void *private_data) { - struct ldapsrv_connection *conn = talloc_get_type(private, struct ldapsrv_connection); + struct ldapsrv_connection *conn = talloc_get_type(private_data, struct ldapsrv_connection); ldapsrv_terminate_connection(conn, "Timeout. No requests after initial connection"); } @@ -328,7 +328,7 @@ failed: static void ldapsrv_accept(struct stream_connection *c) { struct ldapsrv_service *ldapsrv_service = - talloc_get_type(c->private, struct ldapsrv_service); + talloc_get_type(c->private_data, struct ldapsrv_service); struct ldapsrv_connection *conn; struct cli_credentials *server_credentials; struct socket_address *socket_address; @@ -347,7 +347,7 @@ static void ldapsrv_accept(struct stream_connection *c) conn->sockets.raw = c->socket; conn->lp_ctx = ldapsrv_service->task->lp_ctx; - c->private = conn; + c->private_data = conn; socket_address = socket_get_my_addr(c->socket, conn); if (!socket_address) { |