s4:service_stream: s/private/private_data

metze

11 files changed, 40 insertions, 40 deletions

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 48ef5c50d2..1cfe9852f0 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -285,7 +285,7 @@ static NTSTATUS kdc_tcp_recv(void *private_data, DATA_BLOB blob)
 */
 static void kdc_tcp_recv_handler(struct stream_connection *conn, uint16_t flags)
 {
-	struct kdc_tcp_connection *kdcconn = talloc_get_type(conn->private, 
+	struct kdc_tcp_connection *kdcconn = talloc_get_type(conn->private_data,
 							     struct kdc_tcp_connection);
 	packet_recv(kdcconn->packet);
 }
@@ -305,7 +305,7 @@ static void kdc_tcp_recv_error(void *private_data, NTSTATUS status)
 */
 static void kdc_tcp_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct kdc_tcp_connection *kdcconn = talloc_get_type(conn->private, 
+	struct kdc_tcp_connection *kdcconn = talloc_get_type(conn->private_data,
 							     struct kdc_tcp_connection);
 	packet_queue_run(kdcconn->packet);
 }
@@ -357,7 +357,7 @@ static bool kdc_process(struct kdc_server *kdc,
 */
 static void kdc_tcp_generic_accept(struct stream_connection *conn, kdc_process_fn_t process_fn)
 {
-	struct kdc_server *kdc = talloc_get_type(conn->private, struct kdc_server);
+	struct kdc_server *kdc = talloc_get_type(conn->private_data, struct kdc_server);
 	struct kdc_tcp_connection *kdcconn;
 
 	kdcconn = talloc_zero(conn, struct kdc_tcp_connection);
@@ -368,7 +368,7 @@ static void kdc_tcp_generic_accept(struct stream_connection *conn, kdc_process_f
 	kdcconn->conn	 = conn;
 	kdcconn->kdc	 = kdc;
 	kdcconn->process = process_fn;
-	conn->private    = kdcconn;
+	conn->private_data    = kdcconn;
 
 	kdcconn->packet = packet_init(kdcconn);
 	if (kdcconn->packet == NULL) {
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 8d7e629848..61ff387152 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -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);
 }
@@ -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) {
diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c
index 3040716897..4306e5a938 100644
--- a/source4/ntp_signd/ntp_signd.c
+++ b/source4/ntp_signd/ntp_signd.c
@@ -263,7 +263,7 @@ static NTSTATUS ntp_signd_recv(void *private_data, DATA_BLOB wrapped_input)
 */
 static void ntp_signd_recv_handler(struct stream_connection *conn, uint16_t flags)
 {
-	struct ntp_signd_connection *ntp_signdconn = talloc_get_type(conn->private, 
+	struct ntp_signd_connection *ntp_signdconn = talloc_get_type(conn->private_data,
 							     struct ntp_signd_connection);
 	packet_recv(ntp_signdconn->packet);
 }
@@ -282,7 +282,7 @@ static void ntp_signd_recv_error(void *private_data, NTSTATUS status)
 */
 static void ntp_signd_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct ntp_signd_connection *ntp_signdconn = talloc_get_type(conn->private, 
+	struct ntp_signd_connection *ntp_signdconn = talloc_get_type(conn->private_data,
 							     struct ntp_signd_connection);
 	packet_queue_run(ntp_signdconn->packet);
 }
@@ -292,7 +292,7 @@ static void ntp_signd_send(struct stream_connection *conn, uint16_t flags)
 */
 static void ntp_signd_accept(struct stream_connection *conn)
 {
-	struct ntp_signd_server *ntp_signd = talloc_get_type(conn->private, struct ntp_signd_server);
+	struct ntp_signd_server *ntp_signd = talloc_get_type(conn->private_data, struct ntp_signd_server);
 	struct ntp_signd_connection *ntp_signdconn;
 
 	ntp_signdconn = talloc_zero(conn, struct ntp_signd_connection);
@@ -302,7 +302,7 @@ static void ntp_signd_accept(struct stream_connection *conn)
 	}
 	ntp_signdconn->conn	 = conn;
 	ntp_signdconn->ntp_signd	 = ntp_signd;
-	conn->private    = ntp_signdconn;
+	conn->private_data    = ntp_signdconn;
 
 	ntp_signdconn->packet = packet_init(ntp_signdconn);
 	if (ntp_signdconn->packet == NULL) {
diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index ec10c748f0..5596944bd8 100644
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -103,7 +103,7 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn)
 {
 	NTSTATUS status;
 	struct dcesrv_socket_context *dcesrv_sock = 
-		talloc_get_type(srv_conn->private, struct dcesrv_socket_context);
+		talloc_get_type(srv_conn->private_data, struct dcesrv_socket_context);
 	struct dcesrv_connection *dcesrv_conn = NULL;
 
 	if (!srv_conn->session_info) {
@@ -144,7 +144,7 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn)
 		dcesrv_conn->auth_state.session_key = dcesrv_inherited_session_key;
 	}
 
-	srv_conn->private = dcesrv_conn;
+	srv_conn->private_data = dcesrv_conn;
 
 	irpc_add_name(srv_conn->msg_ctx, "rpc_server");
 
@@ -154,7 +154,7 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn)
 static void dcesrv_sock_recv(struct stream_connection *conn, uint16_t flags)
 {
 	NTSTATUS status;
-	struct dcesrv_connection *dce_conn = talloc_get_type(conn->private, struct dcesrv_connection);
+	struct dcesrv_connection *dce_conn = talloc_get_type(conn->private_data, struct dcesrv_connection);
 	DATA_BLOB tmp_blob;
 	size_t nread;
 
@@ -200,7 +200,7 @@ static void dcesrv_sock_recv(struct stream_connection *conn, uint16_t flags)
 
 static void dcesrv_sock_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct dcesrv_connection *dce_conn = talloc_get_type(conn->private, struct dcesrv_connection);
+	struct dcesrv_connection *dce_conn = talloc_get_type(conn->private_data, struct dcesrv_connection);
 	NTSTATUS status;
 
 	status = dcesrv_output(dce_conn, conn->socket, dcerpc_write_fn);
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index a18440bfa8..6206a03b21 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -88,7 +88,7 @@ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char
 */
 static void smbsrv_recv(struct stream_connection *conn, uint16_t flags)
 {
-	struct smbsrv_connection *smb_conn = talloc_get_type(conn->private,
+	struct smbsrv_connection *smb_conn = talloc_get_type(conn->private_data,
 							     struct smbsrv_connection);
 
 	DEBUG(10,("smbsrv_recv\n"));
@@ -101,7 +101,7 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags)
 */
 static void smbsrv_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, 
+	struct smbsrv_connection *smb_conn = talloc_get_type(conn->private_data,
 							     struct smbsrv_connection);
 	packet_queue_run(smb_conn->packet);
 }
@@ -148,7 +148,7 @@ static void smbsrv_accept(struct stream_connection *conn)
 
 	smb_conn->lp_ctx = conn->lp_ctx;
 	smb_conn->connection = conn;
-	conn->private = smb_conn;
+	conn->private_data = smb_conn;
 
 	smb_conn->statistics.connect_time = timeval_current();
 
diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c
index ffa4072392..de4726e4d5 100644
--- a/source4/smbd/service_named_pipe.c
+++ b/source4/smbd/service_named_pipe.c
@@ -60,8 +60,8 @@ static void named_pipe_handover_connection(void *private_data)
 	/*
 	 * remove the named_pipe layer together with its packet layer
 	 */
-	conn->ops	= pipe_conn->pipe_sock->ops;
-	conn->private	= pipe_conn->pipe_sock->private_data;
+	conn->ops		= pipe_conn->pipe_sock->ops;
+	conn->private_data	= pipe_conn->pipe_sock->private_data;
 	talloc_free(pipe_conn);
 
 	/* we're now ready to start receiving events on this stream */
@@ -209,7 +209,7 @@ reply:
 static void named_pipe_recv(struct stream_connection *conn, uint16_t flags)
 {
 	struct named_pipe_connection *pipe_conn = talloc_get_type(
-		conn->private, struct named_pipe_connection);
+		conn->private_data, struct named_pipe_connection);
 
 	DEBUG(10,("named_pipe_recv\n"));
 
@@ -222,7 +222,7 @@ static void named_pipe_recv(struct stream_connection *conn, uint16_t flags)
 static void named_pipe_send(struct stream_connection *conn, uint16_t flags)
 {
 	struct named_pipe_connection *pipe_conn = talloc_get_type(
-		conn->private, struct named_pipe_connection);
+		conn->private_data, struct named_pipe_connection);
 
 	packet_queue_run(pipe_conn->packet);
 }
@@ -262,7 +262,7 @@ static NTSTATUS named_pipe_full_request(void *private_data, DATA_BLOB blob, size
 static void named_pipe_accept(struct stream_connection *conn)
 {
 	struct named_pipe_socket *pipe_sock = talloc_get_type(
-		conn->private, struct named_pipe_socket);
+		conn->private_data, struct named_pipe_socket);
 	struct named_pipe_connection *pipe_conn;
 
 	DEBUG(5,("named_pipe_accept\n"));
@@ -291,7 +291,7 @@ static void named_pipe_accept(struct stream_connection *conn)
 	pipe_conn->pipe_sock = pipe_sock;
 
 	pipe_conn->connection = conn;
-	conn->private = pipe_conn;
+	conn->private_data = pipe_conn;
 }
 
 static const struct stream_server_ops named_pipe_stream_ops = {
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index fe07dc5a38..e09ac1d9e6 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -136,7 +136,7 @@ NTSTATUS stream_new_connection_merge(struct tevent_context *ev,
 
 	talloc_steal(srv_conn, sock);
 
-	srv_conn->private       = private_data;
+	srv_conn->private_data  = private_data;
 	srv_conn->model_ops     = model_ops;
 	srv_conn->socket	= sock;
 	srv_conn->server_id	= cluster_id(0, 0);
@@ -177,7 +177,7 @@ static void stream_new_connection(struct tevent_context *ev,
 
 	talloc_steal(srv_conn, sock);
 
-	srv_conn->private       = stream_socket->private_data;
+	srv_conn->private_data	= stream_socket->private_data;
 	srv_conn->model_ops     = stream_socket->model_ops;
 	srv_conn->socket	= sock;
 	srv_conn->server_id	= server_id;
diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h
index 078887bf14..5d577d4dd8 100644
--- a/source4/smbd/service_stream.h
+++ b/source4/smbd/service_stream.h
@@ -39,7 +39,7 @@ struct stream_connection {
 	const struct stream_server_ops *ops;
 	const struct model_ops *model_ops;
 	struct server_id server_id;
-	void *private;
+	void *private_data;
 
 	struct {
 		struct tevent_context *ctx;
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 1c7449fb47..2a2bfbb13b 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -145,7 +145,7 @@ NTSTATUS http_parse_header(struct websrv_context *web, const char *line)
 static void websrv_recv(struct stream_connection *conn, uint16_t flags)
 {
 	struct web_server_data *wdata;
-	struct websrv_context *web = talloc_get_type(conn->private, 
+	struct websrv_context *web = talloc_get_type(conn->private_data,
 						     struct websrv_context);
 	NTSTATUS status;
 	uint8_t buf[1024];
@@ -220,7 +220,7 @@ failed:
 */
 static void websrv_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct websrv_context *web = talloc_get_type(conn->private, 
+	struct websrv_context *web = talloc_get_type(conn->private_data,
 						     struct websrv_context);
 	NTSTATUS status;
 	size_t nsent;
@@ -251,7 +251,7 @@ static void websrv_send(struct stream_connection *conn, uint16_t flags)
 */
 static void websrv_accept(struct stream_connection *conn)
 {
-	struct task_server *task = talloc_get_type(conn->private, struct task_server);
+	struct task_server *task = talloc_get_type(conn->private_data, struct task_server);
 	struct web_server_data *wdata = talloc_get_type(task->private_data, struct web_server_data);
 	struct websrv_context *web;
 	struct socket_context *tls_socket;
@@ -261,7 +261,7 @@ static void websrv_accept(struct stream_connection *conn)
 
 	web->task = task;
 	web->conn = conn;
-	conn->private = web;
+	conn->private_data = web;
 	talloc_set_destructor(web, websrv_destructor);
 
 	event_add_timed(conn->event.ctx, web, 
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index bf1f3f29ac..95be49d1e3 100644
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -49,7 +49,7 @@ static void wbsrv_recv_error(void *private_data, NTSTATUS status)
 
 static void wbsrv_accept(struct stream_connection *conn)
 {
-	struct wbsrv_listen_socket *listen_socket = talloc_get_type(conn->private, 
+	struct wbsrv_listen_socket *listen_socket = talloc_get_type(conn->private_data,
 								    struct wbsrv_listen_socket);
 	struct wbsrv_connection *wbconn;
 
@@ -61,7 +61,7 @@ static void wbsrv_accept(struct stream_connection *conn)
 	wbconn->conn	      = conn;
 	wbconn->listen_socket = listen_socket;
 	wbconn->lp_ctx        = listen_socket->service->task->lp_ctx;
-	conn->private         = wbconn;
+	conn->private_data    = wbconn;
 
 	wbconn->packet = packet_init(wbconn);
 	if (wbconn->packet == NULL) {
@@ -83,7 +83,7 @@ static void wbsrv_accept(struct stream_connection *conn)
 */
 static void wbsrv_recv(struct stream_connection *conn, uint16_t flags)
 {
-	struct wbsrv_connection *wbconn = talloc_get_type(conn->private, 
+	struct wbsrv_connection *wbconn = talloc_get_type(conn->private_data,
 							  struct wbsrv_connection);
 	packet_recv(wbconn->packet);
 
@@ -94,7 +94,7 @@ static void wbsrv_recv(struct stream_connection *conn, uint16_t flags)
 */
 static void wbsrv_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct wbsrv_connection *wbconn = talloc_get_type(conn->private, 
+	struct wbsrv_connection *wbconn = talloc_get_type(conn->private_data,
 							  struct wbsrv_connection);
 	packet_queue_run(wbconn->packet);
 }
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 711ae866dd..e6a69b829a 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -123,7 +123,7 @@ static NTSTATUS wreplsrv_recv_request(void *private_data, DATA_BLOB blob)
 */
 static void wreplsrv_recv(struct stream_connection *conn, uint16_t flags)
 {
-	struct wreplsrv_in_connection *wreplconn = talloc_get_type(conn->private,
+	struct wreplsrv_in_connection *wreplconn = talloc_get_type(conn->private_data,
 								   struct wreplsrv_in_connection);
 
 	packet_recv(wreplconn->packet);
@@ -134,7 +134,7 @@ static void wreplsrv_recv(struct stream_connection *conn, uint16_t flags)
 */
 static void wreplsrv_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct wreplsrv_in_connection *wreplconn = talloc_get_type(conn->private,
+	struct wreplsrv_in_connection *wreplconn = talloc_get_type(conn->private_data,
 								   struct wreplsrv_in_connection);
 	packet_queue_run(wreplconn->packet);
 }
@@ -154,7 +154,7 @@ static void wreplsrv_recv_error(void *private_data, NTSTATUS status)
 */
 static void wreplsrv_accept(struct stream_connection *conn)
 {
-	struct wreplsrv_service *service = talloc_get_type(conn->private, struct wreplsrv_service);
+	struct wreplsrv_service *service = talloc_get_type(conn->private_data, struct wreplsrv_service);
 	struct wreplsrv_in_connection *wreplconn;
 	struct socket_address *peer_ip;
 
@@ -189,7 +189,7 @@ static void wreplsrv_accept(struct stream_connection *conn)
 
 	wreplconn->partner	= wreplsrv_find_partner(service, peer_ip->addr);
 
-	conn->private = wreplconn;
+	conn->private_data = wreplconn;
 
 	irpc_add_name(conn->msg_ctx, "wreplsrv_connection");
 }