s4-nbt: use private_data instead of private.

Guenther

3 files changed, 13 insertions, 13 deletions

diff --git a/source4/nbt_server/wins/wins_dns_proxy.c b/source4/nbt_server/wins/wins_dns_proxy.c
index 3322ad55fd..cd605907a8 100644
--- a/source4/nbt_server/wins/wins_dns_proxy.c
+++ b/source4/nbt_server/wins/wins_dns_proxy.c
@@ -68,7 +68,7 @@ void nbtd_wins_dns_proxy_query(struct nbt_name_socket *nbtsock,
 			       struct socket_address *src)
 {
 	struct nbt_name *name = &packet->questions[0].name;
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_dns_proxy_state *s;
 	struct composite_context *creq;
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index f8901ce09d..399530b4cf 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -68,7 +68,7 @@ static uint8_t wins_register_new(struct nbt_name_socket *nbtsock,
 				 const struct socket_address *src,
 				 enum wrepl_name_type type)
 {
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_server *winssrv = iface->nbtsrv->winssrv;
 	struct nbt_name *name = &packet->questions[0].name;
@@ -119,7 +119,7 @@ static uint8_t wins_update_ttl(struct nbt_name_socket *nbtsock,
 			       struct winsdb_addr *winsdb_addr,
 			       const struct socket_address *src)
 {
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_server *winssrv = iface->nbtsrv->winssrv;
 	uint32_t ttl = wins_server_ttl(winssrv, packet->additional[0].ttl);
@@ -158,7 +158,7 @@ static uint8_t wins_sgroup_merge(struct nbt_name_socket *nbtsock,
 			         const char *address,
 			         const struct socket_address *src)
 {
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_server *winssrv = iface->nbtsrv->winssrv;
 	uint32_t ttl = wins_server_ttl(winssrv, packet->additional[0].ttl);
@@ -357,7 +357,7 @@ static void wins_register_wack(struct nbt_name_socket *nbtsock,
 			       struct socket_address *src,
 			       enum wrepl_name_type new_type)
 {
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_server *winssrv = iface->nbtsrv->winssrv;
 	struct wack_state *s;
@@ -415,7 +415,7 @@ static void nbtd_winsserver_register(struct nbt_name_socket *nbtsock,
 				     struct socket_address *src)
 {
 	NTSTATUS status;
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_server *winssrv = iface->nbtsrv->winssrv;
 	struct nbt_name *name = &packet->questions[0].name;
@@ -671,7 +671,7 @@ static void nbtd_winsserver_query(struct loadparm_context *lp_ctx,
 				  struct socket_address *src)
 {
 	NTSTATUS status;
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_server *winssrv = iface->nbtsrv->winssrv;
 	struct nbt_name *name = &packet->questions[0].name;
@@ -813,7 +813,7 @@ static void nbtd_winsserver_release(struct nbt_name_socket *nbtsock,
 				    struct socket_address *src)
 {
 	NTSTATUS status;
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_server *winssrv = iface->nbtsrv->winssrv;
 	struct nbt_name *name = &packet->questions[0].name;
@@ -928,7 +928,7 @@ void nbtd_winsserver_request(struct nbt_name_socket *nbtsock,
 			     struct nbt_name_packet *packet, 
 			     struct socket_address *src)
 {
-	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+	struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
 						       struct nbtd_interface);
 	struct wins_server *winssrv = iface->nbtsrv->winssrv;
 	if ((packet->operation & NBT_FLAG_BROADCAST) || winssrv == NULL) {
diff --git a/source4/nbt_server/wins/winswack.c b/source4/nbt_server/wins/winswack.c
index 43d2747ae7..7e0c73a810 100644
--- a/source4/nbt_server/wins/winswack.c
+++ b/source4/nbt_server/wins/winswack.c
@@ -37,7 +37,7 @@ struct wins_challenge_state {
 
 static void wins_challenge_handler(struct nbt_name_request *req)
 {
-	struct composite_context *ctx = talloc_get_type(req->async.private, struct composite_context);
+	struct composite_context *ctx = talloc_get_type(req->async.private_data, struct composite_context);
 	struct wins_challenge_state *state = talloc_get_type(ctx->private_data, struct wins_challenge_state);
 
 	ctx->status = nbt_name_query_recv(req, state, &state->query);
@@ -123,7 +123,7 @@ struct composite_context *wins_challenge_send(TALLOC_CTX *mem_ctx, struct wins_c
 	if (req == NULL) goto failed;
 
 	req->async.fn = wins_challenge_handler;
-	req->async.private = result;
+	req->async.private_data = result;
 
 	return result;
 failed:
@@ -151,7 +151,7 @@ struct wins_release_demand_state {
 
 static void wins_release_demand_handler(struct nbt_name_request *req)
 {
-	struct composite_context *ctx = talloc_get_type(req->async.private, struct composite_context);
+	struct composite_context *ctx = talloc_get_type(req->async.private_data, struct composite_context);
 	struct wins_release_demand_state *state = talloc_get_type(ctx->private_data, struct wins_release_demand_state);
 
 	ctx->status = nbt_name_release_recv(req, state, &state->release);
@@ -240,7 +240,7 @@ static struct composite_context *wins_release_demand_send(TALLOC_CTX *mem_ctx, s
 	if (req == NULL) goto failed;
 
 	req->async.fn = wins_release_demand_handler;
-	req->async.private = result;
+	req->async.private_data = result;
 
 	return result;
 failed: