s4-nbt: use private_data instead of private.

Guenther

3 files changed, 11 insertions, 11 deletions

diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index 80027a1b68..b1b703a3c2 100644
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -33,7 +33,7 @@ struct result_struct {
 
 static void increment_handler(struct nbt_name_request *req)
 {
-	struct result_struct *v = talloc_get_type(req->async.private, struct result_struct);
+	struct result_struct *v = talloc_get_type(req->async.private_data, struct result_struct);
 	if (req->state != NBT_REQUEST_DONE) {
 		v->num_fail++;
 	} else {
@@ -76,7 +76,7 @@ static bool bench_namequery(struct torture_context *tctx)
 			req = nbt_name_query_send(nbtsock, &io);
 			torture_assert(tctx, req != NULL, "Failed to setup request!");
 			req->async.fn = increment_handler;
-			req->async.private = result;
+			req->async.private_data = result;
 			num_sent++;
 			if (num_sent % 1000 == 0) {
 				if (torture_setting_bool(tctx, "progress", true)) {
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index a0d90fb653..bea3d4f9cf 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -56,7 +56,7 @@ static struct nbt_name generate_name(TALLOC_CTX *tctx, int idx)
 
 static void register_handler(struct nbt_name_request *req)
 {
-	struct idx_state *istate = talloc_get_type(req->async.private, struct idx_state);
+	struct idx_state *istate = talloc_get_type(req->async.private_data, struct idx_state);
 	struct wins_state *state = istate->state;
 	struct nbt_name_register io;
 	NTSTATUS status;
@@ -100,7 +100,7 @@ static void generate_register(struct nbt_name_socket *nbtsock, struct wins_state
 	req = nbt_name_register_send(nbtsock, &io);
 
 	req->async.fn = register_handler;
-	req->async.private = istate;
+	req->async.private_data = istate;
 
 	talloc_free(tmp_ctx);
 }
@@ -108,7 +108,7 @@ static void generate_register(struct nbt_name_socket *nbtsock, struct wins_state
 
 static void release_handler(struct nbt_name_request *req)
 {
-	struct idx_state *istate = talloc_get_type(req->async.private, struct idx_state);
+	struct idx_state *istate = talloc_get_type(req->async.private_data, struct idx_state);
 	struct wins_state *state = istate->state;
 	struct nbt_name_release io;
 	NTSTATUS status;
@@ -150,7 +150,7 @@ static void generate_release(struct nbt_name_socket *nbtsock, struct wins_state
 	req = nbt_name_release_send(nbtsock, &io);
 
 	req->async.fn = release_handler;
-	req->async.private = istate;
+	req->async.private_data = istate;
 
 	talloc_free(tmp_ctx);
 }
@@ -158,7 +158,7 @@ static void generate_release(struct nbt_name_socket *nbtsock, struct wins_state
 
 static void query_handler(struct nbt_name_request *req)
 {
-	struct idx_state *istate = talloc_get_type(req->async.private, struct idx_state);
+	struct idx_state *istate = talloc_get_type(req->async.private_data, struct idx_state);
 	struct wins_state *state = istate->state;
 	struct nbt_name_query io;
 	NTSTATUS status;
@@ -197,7 +197,7 @@ static void generate_query(struct nbt_name_socket *nbtsock, struct wins_state *s
 	req = nbt_name_query_send(nbtsock, &io);
 
 	req->async.fn = query_handler;
-	req->async.private = istate;
+	req->async.private_data = istate;
 
 	talloc_free(tmp_ctx);
 }
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 6b600bd7cd..b688f1fbfe 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -9457,7 +9457,7 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
 	struct nbt_name *name;
 	struct nbt_name_packet *rep_packet;
 	struct test_conflict_owned_active_vs_replica_struct *rec = 
-		(struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
+		(struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private_data;
 
 	_NBT_ASSERT(req_packet->qdcount, 1);
 	_NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9556,7 +9556,7 @@ static void test_conflict_owned_active_vs_replica_handler_release(
 	struct nbt_name *name;
 	struct nbt_name_packet *rep_packet;
 	struct test_conflict_owned_active_vs_replica_struct *rec = 
-		(struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
+		(struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private_data;
 
 	_NBT_ASSERT(req_packet->qdcount, 1);
 	_NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9610,7 +9610,7 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
 							  struct socket_address *src)
 {
 	struct test_conflict_owned_active_vs_replica_struct *rec = 
-		(struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
+		(struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private_data;
 
 	rec->defend.ret = false;