3 files changed, 12 insertions, 12 deletions
diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 0fe6fcce90..f3f843b920 100644
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -100,9 +100,9 @@ struct ldapsrv_sasl_context {
 	struct socket_context *sasl_socket;
 };
 
-static void ldapsrv_set_sasl(void *private) 
+static void ldapsrv_set_sasl(void *private_data)
 {
-	struct ldapsrv_sasl_context *ctx = talloc_get_type(private, struct ldapsrv_sasl_context);
+	struct ldapsrv_sasl_context *ctx = talloc_get_type(private_data, struct ldapsrv_sasl_context);
 	talloc_steal(ctx->conn->connection, ctx->sasl_socket);
 	talloc_unlink(ctx->conn->connection, ctx->conn->connection->socket);
 
diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c
index 334e427d79..4479eab560 100644
--- a/source4/ldap_server/ldap_extended.c
+++ b/source4/ldap_server/ldap_extended.c
@@ -29,9 +29,9 @@ struct ldapsrv_starttls_context {
 	struct socket_context *tls_socket;
 };
 
-static void ldapsrv_start_tls(void *private) 
+static void ldapsrv_start_tls(void *private_data)
 {
-	struct ldapsrv_starttls_context *ctx = talloc_get_type(private, struct ldapsrv_starttls_context);
+	struct ldapsrv_starttls_context *ctx = talloc_get_type(private_data, struct ldapsrv_starttls_context);
 	talloc_steal(ctx->conn->connection, ctx->tls_socket);
 	talloc_unlink(ctx->conn->connection, ctx->conn->connection->socket);
 
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index ed8e6d3a2c..8d7e629848 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");
 }
@@ -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");
 }