r22944: fix bug #4618:

rename private -> private_data

metze
(This used to be commit 58551f2f28fce8f1fcd04736c47ecd7458f32ea2)

29 files changed, 118 insertions, 118 deletions

diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index 7ff9efeb0a..ba92111646 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -123,7 +123,7 @@ static void dreplsrv_out_drsuapi_bind_send(struct dreplsrv_out_drsuapi_state *st
 
 static void dreplsrv_out_drsuapi_bind_recv(struct rpc_request *req)
 {
-	struct dreplsrv_out_drsuapi_state *st = talloc_get_type(req->async.private,
+	struct dreplsrv_out_drsuapi_state *st = talloc_get_type(req->async.private_data,
 						struct dreplsrv_out_drsuapi_state);
 	struct composite_context *c = st->creq;
 
@@ -286,7 +286,7 @@ static void dreplsrv_op_pull_source_apply_changes_send(struct dreplsrv_op_pull_s
 
 static void dreplsrv_op_pull_source_get_changes_recv(struct rpc_request *req)
 {
-	struct dreplsrv_op_pull_source_state *st = talloc_get_type(req->async.private,
+	struct dreplsrv_op_pull_source_state *st = talloc_get_type(req->async.private_data,
 						   struct dreplsrv_op_pull_source_state);
 	struct composite_context *c = st->creq;
 	struct drsuapi_DsGetNCChanges *r = talloc_get_type(req->ndr.struct_ptr,
diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c
index e690c33f58..e929ad70e3 100644
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -158,7 +158,7 @@ _PUBLIC_ void composite_continue_rpc(struct composite_context *ctx,
 {
 	if (composite_nomem(new_req, ctx)) return;
 	new_req->async.callback = continuation;
-	new_req->async.private = private_data;
+	new_req->async.private_data = private_data;
 }
 
 _PUBLIC_ void composite_continue_irpc(struct composite_context *ctx,
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index beb12d2ad0..817fae12c5 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1647,7 +1647,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s);
 
 static void becomeDC_drsuapi1_bind_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	WERROR status;
@@ -2127,7 +2127,7 @@ static NTSTATUS becomeDC_prepare_db(struct libnet_BecomeDC_state *s);
 
 static void becomeDC_drsuapi1_add_entry_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	struct drsuapi_DsAddEntry *r = talloc_get_type(req->ndr.struct_ptr,
@@ -2259,7 +2259,7 @@ static void becomeDC_drsuapi3_connect_recv(struct composite_context *req);
 
 static void becomeDC_drsuapi2_bind_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	char *binding_str;
@@ -2481,7 +2481,7 @@ static void becomeDC_drsuapi3_pull_config_send(struct libnet_BecomeDC_state *s);
 
 static void becomeDC_drsuapi3_pull_schema_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	struct drsuapi_DsGetNCChanges *r = talloc_get_type(req->ndr.struct_ptr,
@@ -2543,7 +2543,7 @@ static void becomeDC_drsuapi3_pull_config_send(struct libnet_BecomeDC_state *s)
 
 static void becomeDC_drsuapi3_pull_config_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	struct drsuapi_DsGetNCChanges *r = talloc_get_type(req->ndr.struct_ptr,
@@ -2611,7 +2611,7 @@ static void becomeDC_drsuapi2_update_refs_schema_recv(struct rpc_request *req);
 
 static void becomeDC_drsuapi3_pull_domain_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	struct drsuapi_DsGetNCChanges *r = talloc_get_type(req->ndr.struct_ptr,
@@ -2687,7 +2687,7 @@ static void becomeDC_drsuapi2_update_refs_config_recv(struct rpc_request *req);
 
 static void becomeDC_drsuapi2_update_refs_schema_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	struct drsuapi_DsReplicaUpdateRefs *r = talloc_get_type(req->ndr.struct_ptr,
@@ -2720,7 +2720,7 @@ static void becomeDC_drsuapi2_update_refs_domain_recv(struct rpc_request *req);
 
 static void becomeDC_drsuapi2_update_refs_config_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	struct drsuapi_DsReplicaUpdateRefs *r = talloc_get_type(req->ndr.struct_ptr,
@@ -2742,7 +2742,7 @@ static void becomeDC_drsuapi2_update_refs_config_recv(struct rpc_request *req)
 
 static void becomeDC_drsuapi2_update_refs_domain_recv(struct rpc_request *req)
 {
-	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
 					  struct libnet_BecomeDC_state);
 	struct composite_context *c = s->creq;
 	struct drsuapi_DsReplicaUpdateRefs *r = talloc_get_type(req->ndr.struct_ptr,
diff --git a/source4/libnet/libnet_domain.c b/source4/libnet/libnet_domain.c
index 1653bc8833..864141fffa 100644
--- a/source4/libnet/libnet_domain.c
+++ b/source4/libnet/libnet_domain.c
@@ -94,7 +94,7 @@ static void continue_domain_open_close(struct rpc_request *req)
 	struct domain_open_samr_state *s;
 	struct rpc_request *conn_req;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_open_samr_state);
 
 	/* receive samr_Close reply */
@@ -130,7 +130,7 @@ static void continue_domain_open_connect(struct rpc_request *req)
 	struct rpc_request *lookup_req;
 	struct samr_LookupDomain *r;
 	
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_open_samr_state);
 
 	/* receive samr_Connect reply */
@@ -160,7 +160,7 @@ static void continue_domain_open_lookup(struct rpc_request *req)
 	struct rpc_request *opendom_req;
 	struct samr_OpenDomain *r;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_open_samr_state);
 	
 	/* receive samr_LookupDomain reply */
@@ -198,7 +198,7 @@ static void continue_domain_open_open(struct rpc_request *req)
 	struct composite_context *c;
 	struct domain_open_samr_state *s;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_open_samr_state);
 
 	/* receive samr_OpenDomain reply */
@@ -473,7 +473,7 @@ static void continue_lsa_policy_open(struct rpc_request *req)
 	struct composite_context *c;
 	struct domain_open_lsa_state *s;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_open_lsa_state);
 
 	c->status = dcerpc_ndr_request_recv(req);
@@ -664,7 +664,7 @@ static void continue_lsa_close(struct rpc_request *req)
 	struct composite_context *c;
 	struct domain_close_lsa_state *s;
 	
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_close_lsa_state);
 
 	c->status = dcerpc_ndr_request_recv(req);
@@ -757,7 +757,7 @@ static void continue_samr_close(struct rpc_request *req)
 	struct composite_context *c;
 	struct domain_close_samr_state *s;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_close_samr_state);
 	
 	c->status = dcerpc_ndr_request_recv(req);
@@ -909,7 +909,7 @@ static void continue_samr_connect(struct rpc_request *req)
 	struct domain_list_state *s;
 	struct rpc_request *enumdom_req;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_list_state);
 	
 	c->status = dcerpc_ndr_request_recv(req);
@@ -939,7 +939,7 @@ static void continue_samr_enum_domains(struct rpc_request *req)
 	struct rpc_request *enumdom_req;
 	struct rpc_request *samrclose_req;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_list_state);
 	
 	c->status = dcerpc_ndr_request_recv(req);
@@ -990,7 +990,7 @@ static void continue_samr_close_handle(struct rpc_request *req)
 	struct composite_context *c;
 	struct domain_list_state *s;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct domain_list_state);
 
 	c->status = dcerpc_ndr_request_recv(req);
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index c8dc726764..32b47d0a7a 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -338,7 +338,7 @@ static void continue_name_found(struct rpc_request *req)
 	struct composite_context *c;
 	struct lookup_name_state *s;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct lookup_name_state);
 
 	c->status = dcerpc_ndr_request_recv(req);
diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 8bc47f7ad6..02efb3a75b 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -516,7 +516,7 @@ static void continue_lsa_policy(struct rpc_request *req)
 	struct rpc_connect_dci_state *s;
 	struct rpc_request *query_info_req;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct rpc_connect_dci_state);
 
 	c->status = dcerpc_ndr_request_recv(req);
@@ -559,7 +559,7 @@ static void continue_lsa_query_info2(struct rpc_request *req)
 	struct rpc_connect_dci_state *s;
 	struct rpc_request *query_info_req;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct rpc_connect_dci_state);
 
 	c->status = dcerpc_ndr_request_recv(req);
@@ -620,7 +620,7 @@ static void continue_lsa_query_info(struct rpc_request *req)
 	struct composite_context *c;
 	struct rpc_connect_dci_state *s;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct rpc_connect_dci_state);
 
 	c->status = dcerpc_ndr_request_recv(req);
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index da7ae5e1e7..9d44fb8e39 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -588,7 +588,7 @@ static void unbecomeDC_drsuapi_remove_ds_server_send(struct libnet_UnbecomeDC_st
 
 static void unbecomeDC_drsuapi_bind_recv(struct rpc_request *req)
 {
-	struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private_data,
 					    struct libnet_UnbecomeDC_state);
 	struct composite_context *c = s->creq;
 
@@ -641,7 +641,7 @@ static void unbecomeDC_drsuapi_remove_ds_server_send(struct libnet_UnbecomeDC_st
 
 static void unbecomeDC_drsuapi_remove_ds_server_recv(struct rpc_request *req)
 {
-	struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private,
+	struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private_data,
 					    struct libnet_UnbecomeDC_state);
 	struct composite_context *c = s->creq;
 	struct drsuapi_DsRemoveDSServer *r = &s->drsuapi.rm_ds_srv_r;
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index 5c0f543d0f..95c7d48de5 100644
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -949,7 +949,7 @@ static void continue_domain_queried(struct rpc_request *req)
 	struct rpc_request *enum_req;
 	BOOL prereq_met = False;
 	
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userlist_state);
 
 	/* receive result of rpc request */
@@ -1020,7 +1020,7 @@ static void continue_users_enumerated(struct rpc_request *req)
 	struct userlist_state *s;
 	int i;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userlist_state);
 
 	/* receive result of rpc request */
diff --git a/source4/libnet/userinfo.c b/source4/libnet/userinfo.c
index 057e13d3b1..08c1ab3242 100644
--- a/source4/libnet/userinfo.c
+++ b/source4/libnet/userinfo.c
@@ -65,7 +65,7 @@ static void continue_userinfo_lookup(struct rpc_request *req)
 	struct monitor_msg msg;
 	struct msg_rpc_lookup_name *msg_lookup;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userinfo_state);
 
 	/* receive samr_Lookup reply */
@@ -124,7 +124,7 @@ static void continue_userinfo_openuser(struct rpc_request *req)
 	struct monitor_msg msg;
 	struct msg_rpc_open_user *msg_open;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userinfo_state);
 
 	/* receive samr_OpenUser reply */
@@ -171,7 +171,7 @@ static void continue_userinfo_getuser(struct rpc_request *req)
 	struct monitor_msg msg;
 	struct msg_rpc_query_user *msg_query;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userinfo_state);
 
 	/* receive samr_QueryUserInfo reply */
@@ -219,7 +219,7 @@ static void continue_userinfo_closeuser(struct rpc_request *req)
 	struct monitor_msg msg;
 	struct msg_rpc_close_user *msg_close;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userinfo_state);
 
 	/* receive samr_Close reply */
diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c
index 879efe9176..065d1002e3 100644
--- a/source4/libnet/userman.c
+++ b/source4/libnet/userman.c
@@ -76,7 +76,7 @@ static NTSTATUS useradd_create(struct composite_context *c,
  */
 static void useradd_handler(struct rpc_request *req)
 {
-	struct composite_context *c = req->async.private;
+	struct composite_context *c = req->async.private_data;
 	struct useradd_state *s = talloc_get_type(c->private_data, struct useradd_state);
 	struct monitor_msg msg;
 	struct msg_rpc_create_user *rpc_create;
@@ -161,7 +161,7 @@ struct composite_context *libnet_rpc_useradd_send(struct dcerpc_pipe *p,
 
 	/* callback handler for continuation */
 	s->req->async.callback = useradd_handler;
-	s->req->async.private  = c;
+	s->req->async.private_data  = c;
 	s->stage = USERADD_CREATE;
 
 	return c;
@@ -271,7 +271,7 @@ static NTSTATUS userdel_lookup(struct composite_context *c,
 
 	/* callback handler setup */
 	s->req->async.callback = userdel_handler;
-	s->req->async.private  = c;
+	s->req->async.private_data  = c;
 	s->stage = USERDEL_OPEN;
 	
 	return NT_STATUS_OK;
@@ -298,7 +298,7 @@ static NTSTATUS userdel_open(struct composite_context *c,
 
 	/* callback handler setup */
 	s->req->async.callback = userdel_handler;
-	s->req->async.private  = c;
+	s->req->async.private_data  = c;
 	s->stage = USERDEL_DELETE;
 	
 	return NT_STATUS_OK;
@@ -338,7 +338,7 @@ static void userdel_handler(struct rpc_request *req)
 	struct msg_rpc_lookup_name *msg_lookup;
 	struct msg_rpc_open_user *msg_open;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userdel_state);
 	
 	switch (s->stage) {
@@ -438,7 +438,7 @@ struct composite_context *libnet_rpc_userdel_send(struct dcerpc_pipe *p,
 
 	/* callback handler setup */
 	s->req->async.callback = userdel_handler;
-	s->req->async.private  = c;
+	s->req->async.private_data  = c;
 	s->stage = USERDEL_LOOKUP;
 
 	return c;
@@ -550,7 +550,7 @@ static NTSTATUS usermod_lookup(struct composite_context *c,
 
 	/* callback handler setup */
 	s->req->async.callback = usermod_handler;
-	s->req->async.private  = c;
+	s->req->async.private_data  = c;
 	s->stage = USERMOD_OPEN;
 	
 	return NT_STATUS_OK;
@@ -722,7 +722,7 @@ static NTSTATUS usermod_change(struct composite_context *c,
 
 	/* callback handler setup */
 	s->req->async.callback = usermod_handler;
-	s->req->async.private  = c;
+	s->req->async.private_data  = c;
 
 	return NT_STATUS_OK;
 }
@@ -770,7 +770,7 @@ static NTSTATUS usermod_query(struct composite_context *c,
 
 	/* callback handler setup */
 	s->req->async.callback = usermod_handler;
-	s->req->async.private  = c;
+	s->req->async.private_data  = c;
 
 	return NT_STATUS_OK;
 }
@@ -816,7 +816,7 @@ static void usermod_handler(struct rpc_request *req)
 	struct msg_rpc_lookup_name *msg_lookup;
 	struct msg_rpc_open_user *msg_open;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct usermod_state);
 
 	switch (s->stage) {
@@ -934,7 +934,7 @@ struct composite_context *libnet_rpc_usermod_send(struct dcerpc_pipe *p,
 	
 	/* callback handler setup */
 	s->req->async.callback = usermod_handler;
-	s->req->async.private  = c;
+	s->req->async.private_data  = c;
 	s->stage = USERMOD_LOOKUP;
 
 	return c;
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index e422fa5444..4e46093573 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -527,7 +527,7 @@ static NTSTATUS dcerpc_map_reason(uint16_t reason)
 */
 static void dcerpc_composite_fail(struct rpc_request *req)
 {
-	struct composite_context *c = talloc_get_type(req->async.private, 
+	struct composite_context *c = talloc_get_type(req->async.private_data, 
 						      struct composite_context);
 	composite_error(c, req->status);
 }
@@ -629,7 +629,7 @@ static void dcerpc_bind_recv_handler(struct rpc_request *req,
 	struct composite_context *c;
 	struct dcerpc_connection *conn;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 
 	if (pkt->ptype == DCERPC_PKT_BIND_NAK) {
 		DEBUG(2,("dcerpc: bind_nak reason %d\n",
@@ -747,7 +747,7 @@ struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p,
 
 	req->state = RPC_REQUEST_PENDING;
 	req->call_id = pkt.call_id;
-	req->async.private = c;
+	req->async.private_data = c;
 	req->async.callback = dcerpc_composite_fail;
 	req->p = p;
 	req->recv_handler = dcerpc_bind_recv_handler;
@@ -958,7 +958,7 @@ static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
 	req->async_call = async;
 	req->ignore_timeout = False;
 	req->async.callback = NULL;
-	req->async.private = NULL;
+	req->async.private_data = NULL;
 	req->recv_handler = NULL;
 
 	if (object != NULL) {
@@ -1526,7 +1526,7 @@ static void dcerpc_alter_recv_handler(struct rpc_request *req,
 	struct composite_context *c;
 	struct dcerpc_pipe *recv_pipe;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	recv_pipe = talloc_get_type(c->private_data, struct dcerpc_pipe);
 
 	if (pkt->ptype == DCERPC_PKT_ALTER_RESP &&
@@ -1618,7 +1618,7 @@ struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p,
 
 	req->state = RPC_REQUEST_PENDING;
 	req->call_id = pkt.call_id;
-	req->async.private = c;
+	req->async.private_data = c;
 	req->async.callback = dcerpc_composite_fail;
 	req->p = p;
 	req->recv_handler = dcerpc_alter_recv_handler;
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index ea6c68b28e..b0224af182 100644
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -62,7 +62,7 @@ struct dcerpc_connection {
 
 	struct dcerpc_transport {
 		enum dcerpc_transport_t transport;
-		void *private;
+		void *private_data;
 
 		NTSTATUS (*shutdown_pipe)(struct dcerpc_connection *, NTSTATUS status);
 
@@ -258,7 +258,7 @@ struct rpc_request {
 
 	struct {
 		void (*callback)(struct rpc_request *);
-		void *private;
+		void *private_data;
 	} async;
 };
 
diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index d5a83b1bfa..15a0159be8 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -156,7 +156,7 @@ static void continue_srv_challenge(struct rpc_request *req)
 	struct schannel_key_state *s;
 	struct rpc_request *srv_auth2_req;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct schannel_key_state);
 
 	/* receive rpc request result - netlogon challenge */
@@ -199,7 +199,7 @@ static void continue_srv_auth2(struct rpc_request *req)
 	struct composite_context *c;
 	struct schannel_key_state *s;
 
-	c = talloc_get_type(req->async.private, struct composite_context);
+	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct schannel_key_state);
 
 	/* receive rpc request result - auth2 credentials */ 
diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index 7f0bcf0485..edeb898d5f 100644
--- a/source4/librpc/rpc/dcerpc_smb.c
+++ b/source4/librpc/rpc/dcerpc_smb.c
@@ -40,7 +40,7 @@ struct smb_private {
 */
 static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status)
 {
-	struct smb_private *smb = c->transport.private;
+	struct smb_private *smb = c->transport.private_data;
 
 	if (smb->dead) {
 		return;
@@ -85,7 +85,7 @@ static void smb_read_callback(struct smbcli_request *req)
 	NTSTATUS status;
 
 	state = talloc_get_type(req->async.private, struct smb_read_state);
-	smb = talloc_get_type(state->c->transport.private, struct smb_private);
+	smb = talloc_get_type(state->c->transport.private_data, struct smb_private);
 	io = state->io;
 
 	status = smb_raw_read_recv(state->req, io);
@@ -142,7 +142,7 @@ static void smb_read_callback(struct smbcli_request *req)
 */
 static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLOB *blob)
 {
-	struct smb_private *smb = c->transport.private;
+	struct smb_private *smb = c->transport.private_data;
 	union smb_read *io;
 	struct smb_read_state *state;
 	struct smbcli_request *req;
@@ -198,7 +198,7 @@ static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLO
 */
 static NTSTATUS send_read_request(struct dcerpc_connection *c)
 {
-	struct smb_private *smb = c->transport.private;
+	struct smb_private *smb = c->transport.private_data;
 
 	if (smb->dead) {
 		return NT_STATUS_CONNECTION_DISCONNECTED;
@@ -250,7 +250,7 @@ static void smb_trans_callback(struct smbcli_request *req)
 */
 static NTSTATUS smb_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *blob)
 {
-        struct smb_private *smb = c->transport.private;
+        struct smb_private *smb = c->transport.private_data;
         struct smb_trans2 *trans;
         uint16_t setup[2];
 	struct smb_trans_state *state;
@@ -313,7 +313,7 @@ static void smb_write_callback(struct smbcli_request *req)
 */
 static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, BOOL trigger_read)
 {
-	struct smb_private *smb = c->transport.private;
+	struct smb_private *smb = c->transport.private_data;
 	union smb_write io;
 	struct smbcli_request *req;
 
@@ -357,7 +357,7 @@ static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, B
 */
 static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status)
 {
-	struct smb_private *smb = c->transport.private;
+	struct smb_private *smb = c->transport.private_data;
 	union smb_close io;
 	struct smbcli_request *req;
 
@@ -383,7 +383,7 @@ static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status)
 */
 static const char *smb_peer_name(struct dcerpc_connection *c)
 {
-	struct smb_private *smb = c->transport.private;
+	struct smb_private *smb = c->transport.private_data;
 	return smb->server_name;
 }
 
@@ -392,7 +392,7 @@ static const char *smb_peer_name(struct dcerpc_connection *c)
 */
 static const char *smb_target_hostname(struct dcerpc_connection *c)
 {
-	struct smb_private *smb = talloc_get_type(c->transport.private, struct smb_private);
+	struct smb_private *smb = talloc_get_type(c->transport.private_data, struct smb_private);
 	return smb->tree->session->transport->socket->hostname;
 }
 
@@ -401,7 +401,7 @@ static const char *smb_target_hostname(struct dcerpc_connection *c)
 */
 static NTSTATUS smb_session_key(struct dcerpc_connection *c, DATA_BLOB *session_key)
 {
-	struct smb_private *smb = c->transport.private;
+	struct smb_private *smb = c->transport.private_data;
 
 	if (smb->tree->session->user_session_key.data) {
 		*session_key = smb->tree->session->user_session_key;
@@ -504,7 +504,7 @@ static void pipe_open_recv(struct smbcli_request *req)
 	  fill in the transport methods
 	*/
 	c->transport.transport       = NCACN_NP;
-	c->transport.private         = NULL;
+	c->transport.private_data    = NULL;
 	c->transport.shutdown_pipe   = smb_shutdown_pipe;
 	c->transport.peer_name       = smb_peer_name;
 	c->transport.target_hostname = smb_target_hostname;
@@ -526,7 +526,7 @@ static void pipe_open_recv(struct smbcli_request *req)
 	if (composite_nomem(smb->server_name, ctx)) return;
 	smb->dead	= false;
 
-	c->transport.private = smb;
+	c->transport.private_data = smb;
 
 	composite_done(ctx);
 }
@@ -556,7 +556,7 @@ struct smbcli_tree *dcerpc_smb_tree(struct dcerpc_connection *c)
 
 	if (c->transport.transport != NCACN_NP) return NULL;
 
-	smb = talloc_get_type(c->transport.private, struct smb_private);
+	smb = talloc_get_type(c->transport.private_data, struct smb_private);
 	if (!smb) return NULL;
 
 	return smb->tree;
@@ -571,7 +571,7 @@ uint16_t dcerpc_smb_fnum(struct dcerpc_connection *c)
 
 	if (c->transport.transport != NCACN_NP) return 0;
 
-	smb = talloc_get_type(c->transport.private, struct smb_private);
+	smb = talloc_get_type(c->transport.private_data, struct smb_private);
 	if (!smb) return 0;
 
 	return smb->fnum;
diff --git a/source4/librpc/rpc/dcerpc_smb2.c b/source4/librpc/rpc/dcerpc_smb2.c
index 56f8e9b85c..06160ff201 100644
--- a/source4/librpc/rpc/dcerpc_smb2.c
+++ b/source4/librpc/rpc/dcerpc_smb2.c
@@ -42,7 +42,7 @@ struct smb2_private {
 */
 static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status)
 {
-	struct smb2_private *smb = c->transport.private;
+	struct smb2_private *smb = c->transport.private_data;
 
 	if (smb->dead) {
 		return;
@@ -84,7 +84,7 @@ static void smb2_read_callback(struct smb2_request *req)
 	NTSTATUS status;
 
 	state = talloc_get_type(req->async.private, struct smb2_read_state);
-	smb = talloc_get_type(state->c->transport.private, struct smb2_private);
+	smb = talloc_get_type(state->c->transport.private_data, struct smb2_private);
 
 	status = smb2_read_recv(req, state, &io);
 	if (NT_STATUS_IS_ERR(status)) {
@@ -147,7 +147,7 @@ static void smb2_read_callback(struct smb2_request *req)
 */
 static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLOB *blob)
 {
-	struct smb2_private *smb = c->transport.private;
+	struct smb2_private *smb = c->transport.private_data;
 	struct smb2_read io;
 	struct smb2_read_state *state;
 	struct smb2_request *req;
@@ -192,7 +192,7 @@ static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLO
 */
 static NTSTATUS send_read_request(struct dcerpc_connection *c)
 {
-	struct smb2_private *smb = c->transport.private;
+	struct smb2_private *smb = c->transport.private_data;
 
 	if (smb->dead) {
 		return NT_STATUS_CONNECTION_DISCONNECTED;
@@ -243,7 +243,7 @@ static void smb2_trans_callback(struct smb2_request *req)
 */
 static NTSTATUS smb2_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *blob)
 {
-        struct smb2_private *smb = talloc_get_type(c->transport.private,
+        struct smb2_private *smb = talloc_get_type(c->transport.private_data,
 						   struct smb2_private);
         struct smb2_ioctl io;
 	struct smb2_trans_state *state;
@@ -298,7 +298,7 @@ static void smb2_write_callback(struct smb2_request *req)
 static NTSTATUS smb2_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, 
 				  BOOL trigger_read)
 {
-	struct smb2_private *smb = c->transport.private;
+	struct smb2_private *smb = c->transport.private_data;
 	struct smb2_write io;
 	struct smb2_request *req;
 
@@ -330,7 +330,7 @@ static NTSTATUS smb2_send_request(struct dcerpc_connection *c, DATA_BLOB *blob,
 */
 static NTSTATUS smb2_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status)
 {
-	struct smb2_private *smb = c->transport.private;
+	struct smb2_private *smb = c->transport.private_data;
 	struct smb2_close io;
 	struct smb2_request *req;
 
@@ -355,7 +355,7 @@ static NTSTATUS smb2_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status)
 */
 static const char *smb2_peer_name(struct dcerpc_connection *c)
 {
-	struct smb2_private *smb = talloc_get_type(c->transport.private,
+	struct smb2_private *smb = talloc_get_type(c->transport.private_data,
 						   struct smb2_private);
 	return smb->server_name;
 }
@@ -365,7 +365,7 @@ static const char *smb2_peer_name(struct dcerpc_connection *c)
 */
 static const char *smb2_target_hostname(struct dcerpc_connection *c)
 {
-	struct smb2_private *smb = talloc_get_type(c->transport.private, 
+	struct smb2_private *smb = talloc_get_type(c->transport.private_data, 
 						   struct smb2_private);
 	return smb->tree->session->transport->socket->hostname;
 }
@@ -375,7 +375,7 @@ static const char *smb2_target_hostname(struct dcerpc_connection *c)
 */
 static NTSTATUS smb2_session_key(struct dcerpc_connection *c, DATA_BLOB *session_key)
 {
-	struct smb2_private *smb = talloc_get_type(c->transport.private,
+	struct smb2_private *smb = talloc_get_type(c->transport.private_data,
 						   struct smb2_private);
 	*session_key = smb->tree->session->session_key;
 	if (session_key->data == NULL) {
@@ -460,7 +460,7 @@ static void pipe_open_recv(struct smb2_request *req)
 	  fill in the transport methods
 	*/
 	c->transport.transport = NCACN_NP;
-	c->transport.private = NULL;
+	c->transport.private_data = NULL;
 	c->transport.shutdown_pipe = smb2_shutdown_pipe;
 	c->transport.peer_name = smb2_peer_name;
 	c->transport.target_hostname = smb2_target_hostname;
@@ -482,7 +482,7 @@ static void pipe_open_recv(struct smb2_request *req)
 	if (composite_nomem(smb->server_name, ctx)) return;
 	smb->dead	= false;
 
-	c->transport.private = smb;
+	c->transport.private_data = smb;
 
 	composite_done(ctx);
 }
@@ -507,7 +507,7 @@ NTSTATUS dcerpc_pipe_open_smb2(struct dcerpc_pipe *p,
 */
 struct smb2_tree *dcerpc_smb2_tree(struct dcerpc_connection *c)
 {
-	struct smb2_private *smb = talloc_get_type(c->transport.private,
+	struct smb2_private *smb = talloc_get_type(c->transport.private_data,
 						   struct smb2_private);
 	return smb->tree;
 }
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 547b3ffb43..f5f4f7c398 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -46,7 +46,7 @@ struct sock_private {
 */
 static void sock_dead(struct dcerpc_connection *p, NTSTATUS status)
 {
-	struct sock_private *sock = p->transport.private;
+	struct sock_private *sock = p->transport.private_data;
 
 	if (!sock) return;
 
@@ -112,7 +112,7 @@ static NTSTATUS sock_process_recv(void *private, DATA_BLOB blob)
 {
 	struct dcerpc_connection *p = talloc_get_type(private, 
 						      struct dcerpc_connection);
-	struct sock_private *sock = p->transport.private;
+	struct sock_private *sock = p->transport.private_data;
 	sock->pending_reads--;
 	if (sock->pending_reads == 0) {
 		packet_recv_disable(sock->packet);
@@ -129,7 +129,7 @@ static void sock_io_handler(struct event_context *ev, struct fd_event *fde,
 {
 	struct dcerpc_connection *p = talloc_get_type(private, 
 						      struct dcerpc_connection);
-	struct sock_private *sock = p->transport.private;
+	struct sock_private *sock = p->transport.private_data;
 
 	if (flags & EVENT_FD_WRITE) {
 		packet_queue_run(sock->packet);
@@ -150,7 +150,7 @@ static void sock_io_handler(struct event_context *ev, struct fd_event *fde,
 */
 static NTSTATUS sock_send_read(struct dcerpc_connection *p)
 {
-	struct sock_private *sock = p->transport.private;
+	struct sock_private *sock = p->transport.private_data;
 	sock->pending_reads++;
 	if (sock->pending_reads == 1) {
 		packet_recv_enable(sock->packet);
@@ -164,7 +164,7 @@ static NTSTATUS sock_send_read(struct dcerpc_connection *p)
 static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data, 
 				  BOOL trigger_read)
 {
-	struct sock_private *sock = p->transport.private;
+	struct sock_private *sock = p->transport.private_data;
 	DATA_BLOB blob;
 	NTSTATUS status;
 
@@ -194,7 +194,7 @@ static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data,
 */
 static NTSTATUS sock_shutdown_pipe(struct dcerpc_connection *p, NTSTATUS status)
 {
-	struct sock_private *sock = p->transport.private;
+	struct sock_private *sock = p->transport.private_data;
 
 	if (sock && sock->sock) {
 		sock_dead(p, status);
@@ -208,7 +208,7 @@ static NTSTATUS sock_shutdown_pipe(struct dcerpc_connection *p, NTSTATUS status)
 */
 static const char *sock_peer_name(struct dcerpc_connection *p)
 {
-	struct sock_private *sock = talloc_get_type(p->transport.private, struct sock_private);
+	struct sock_private *sock = talloc_get_type(p->transport.private_data, struct sock_private);
 	return sock->server_name;
 }
 
@@ -217,7 +217,7 @@ static const char *sock_peer_name(struct dcerpc_connection *p)
 */
 static const char *sock_target_hostname(struct dcerpc_connection *p)
 {
-	struct sock_private *sock = talloc_get_type(p->transport.private, struct sock_private);
+	struct sock_private *sock = talloc_get_type(p->transport.private_data, struct sock_private);
 	return sock->server_name;
 }
 
@@ -258,7 +258,7 @@ static void continue_socket_connect(struct composite_context *ctx)
 	  fill in the transport methods
 	*/
 	conn->transport.transport       = s->transport;
-	conn->transport.private         = NULL;
+	conn->transport.private_data    = NULL;
 
 	conn->transport.send_request    = sock_send_request;
 	conn->transport.send_read       = sock_send_read;
@@ -275,7 +275,7 @@ static void continue_socket_connect(struct composite_context *ctx)
 	sock->fde = event_add_fd(conn->event_ctx, sock->sock, socket_get_fd(sock->sock),
 				 EVENT_FD_READ, sock_io_handler, conn);
 	
-	conn->transport.private = sock;
+	conn->transport.private_data = sock;
 
 	sock->packet = packet_init(sock);
 	if (sock->packet == NULL) {
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index c3e104e78b..19ad8790a8 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -830,7 +830,7 @@ static void continue_epm_recv_binding(struct composite_context *ctx)
 */
 static void continue_epm_map(struct rpc_request *req)
 {
-	struct composite_context *c = talloc_get_type(req->async.private,
+	struct composite_context *c = talloc_get_type(req->async.private_data,
 						      struct composite_context);
 	struct epm_map_binding_state *s = talloc_get_type(c->private_data,
 							  struct epm_map_binding_state);
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 1c2a9fd41d..b909c2082d 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -516,7 +516,7 @@ BOOL test_many_LookupSids(struct dcerpc_pipe *p,
 
 static void lookupsids_cb(struct rpc_request *req)
 {
-	int *replies = (int *)req->async.private;
+	int *replies = (int *)req->async.private_data;
 	NTSTATUS status;
 
 	status = dcerpc_ndr_request_recv(req);
@@ -578,7 +578,7 @@ static BOOL test_LookupSids_async(struct dcerpc_pipe *p,
 		}
 
 		req[i]->async.callback = lookupsids_cb;
-		req[i]->async.private = &replies;
+		req[i]->async.private_data = &replies;
 	}
 
 	while (replies >= 0 && replies < num_async_requests) {
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 0e281c6736..7e8ef99bf6 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -1372,7 +1372,7 @@ static BOOL test_GetDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 static void async_callback(struct rpc_request *req)
 {
-	int *counter = req->async.private;
+	int *counter = req->async.private_data;
 	if (NT_STATUS_IS_OK(req->status)) {
 		(*counter)++;
 	}
@@ -1431,7 +1431,7 @@ static BOOL test_GetDomainInfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 		req[i] = dcerpc_netr_LogonGetDomainInfo_send(p, mem_ctx, &r);
 
 		req[i]->async.callback = async_callback;
-		req[i]->async.private = async_counter;
+		req[i]->async.private_data = async_counter;
 
 		/* even with this flush per request a w2k3 server seems to 
 		   clag with multiple outstanding requests. bleergh. */
diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index 91e80e8cc5..88cf835faa 100644
--- a/source4/winbind/wb_async_helpers.c
+++ b/source4/winbind/wb_async_helpers.c
@@ -148,7 +148,7 @@ static void get_schannel_creds_recv_anonbind(struct composite_context *creq)
 static void get_schannel_creds_recv_chal(struct rpc_request *req)
 {
 	struct composite_context *c =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct composite_context);
 	struct get_schannel_creds_state *state =
 		talloc_get_type(c->private_data,
@@ -192,7 +192,7 @@ static void get_schannel_creds_recv_chal(struct rpc_request *req)
 static void get_schannel_creds_recv_auth(struct rpc_request *req)
 {
 	struct composite_context *c =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct composite_context);
 	struct get_schannel_creds_state *state =
 		talloc_get_type(c->private_data,
@@ -301,7 +301,7 @@ struct composite_context *wb_lsa_lookupsids_send(TALLOC_CTX *mem_ctx,
 	if (req == NULL) goto failed;
 
 	req->async.callback = lsa_lookupsids_recv_names;
-	req->async.private = state;
+	req->async.private_data = state;
 	return result;
 
  failed:
@@ -312,7 +312,7 @@ struct composite_context *wb_lsa_lookupsids_send(TALLOC_CTX *mem_ctx,
 static void lsa_lookupsids_recv_names(struct rpc_request *req)
 {
 	struct lsa_lookupsids_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct lsa_lookupsids_state);
 	int i;
 
@@ -456,7 +456,7 @@ struct composite_context *wb_lsa_lookupnames_send(TALLOC_CTX *mem_ctx,
 	if (req == NULL) goto failed;
 
 	req->async.callback = lsa_lookupnames_recv_sids;
-	req->async.private = state;
+	req->async.private_data = state;
 	return result;
 
  failed:
@@ -467,7 +467,7 @@ struct composite_context *wb_lsa_lookupnames_send(TALLOC_CTX *mem_ctx,
 static void lsa_lookupnames_recv_sids(struct rpc_request *req)
 {
 	struct lsa_lookupnames_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct lsa_lookupnames_state);
 	int i;
 
@@ -652,7 +652,7 @@ struct composite_context *wb_samr_userdomgroups_send(TALLOC_CTX *mem_ctx,
 	if (req == NULL) goto failed;
 
 	req->async.callback = samr_usergroups_recv_open;
-	req->async.private = state;
+	req->async.private_data = state;
 	return result;
 
  failed:
@@ -663,7 +663,7 @@ struct composite_context *wb_samr_userdomgroups_send(TALLOC_CTX *mem_ctx,
 static void samr_usergroups_recv_open(struct rpc_request *req)
 {
 	struct samr_getuserdomgroups_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct samr_getuserdomgroups_state);
 
 	state->ctx->status = dcerpc_ndr_request_recv(req);
@@ -682,7 +682,7 @@ static void samr_usergroups_recv_open(struct rpc_request *req)
 static void samr_usergroups_recv_groups(struct rpc_request *req)
 {
 	struct samr_getuserdomgroups_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct samr_getuserdomgroups_state);
 
 	state->ctx->status = dcerpc_ndr_request_recv(req);
@@ -701,7 +701,7 @@ static void samr_usergroups_recv_groups(struct rpc_request *req)
 static void samr_usergroups_recv_close(struct rpc_request *req)
 {
         struct samr_getuserdomgroups_state *state =
-                talloc_get_type(req->async.private,
+                talloc_get_type(req->async.private_data,
                                 struct samr_getuserdomgroups_state);
 
         state->ctx->status = dcerpc_ndr_request_recv(req);
diff --git a/source4/winbind/wb_cmd_getdcname.c b/source4/winbind/wb_cmd_getdcname.c
index 0696ff5572..ff92b6d663 100644
--- a/source4/winbind/wb_cmd_getdcname.c
+++ b/source4/winbind/wb_cmd_getdcname.c
@@ -93,7 +93,7 @@ static void getdcname_recv_domain(struct composite_context *ctx)
 static void getdcname_recv_dcname(struct rpc_request *req)
 {
 	struct cmd_getdcname_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct cmd_getdcname_state);
 
 	state->ctx->status = dcerpc_ndr_request_recv(req);
diff --git a/source4/winbind/wb_cmd_list_trustdom.c b/source4/winbind/wb_cmd_list_trustdom.c
index 4635f23312..c39fe499a7 100644
--- a/source4/winbind/wb_cmd_list_trustdom.c
+++ b/source4/winbind/wb_cmd_list_trustdom.c
@@ -124,7 +124,7 @@ static void cmd_list_trustdoms_recv_lsa(struct composite_context *ctx)
 static void cmd_list_trustdoms_recv_doms(struct rpc_request *req)
 {
 	struct cmd_list_trustdom_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct cmd_list_trustdom_state);
 	int i, old_num_domains;
 
diff --git a/source4/winbind/wb_cmd_usersids.c b/source4/winbind/wb_cmd_usersids.c
index aa8a9ea9c0..1bde29f209 100644
--- a/source4/winbind/wb_cmd_usersids.c
+++ b/source4/winbind/wb_cmd_usersids.c
@@ -135,7 +135,7 @@ static void usersids_recv_domain(struct composite_context *ctx)
 static void usersids_recv_aliases(struct rpc_request *req)
 {
 	struct cmd_usersids_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct cmd_usersids_state);
 	int i;
 
diff --git a/source4/winbind/wb_connect_lsa.c b/source4/winbind/wb_connect_lsa.c
index 5a72e59954..219865b78c 100644
--- a/source4/winbind/wb_connect_lsa.c
+++ b/source4/winbind/wb_connect_lsa.c
@@ -178,7 +178,7 @@ static void init_lsa_recv_auth_bind(struct composite_context *ctx)
 static void init_lsa_recv_openpol(struct rpc_request *req)
 {
 	struct init_lsa_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct init_lsa_state);
 
 	state->ctx->status = dcerpc_ndr_request_recv(req);
diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c
index a14b7bd83b..4423e3e91d 100644
--- a/source4/winbind/wb_connect_sam.c
+++ b/source4/winbind/wb_connect_sam.c
@@ -180,7 +180,7 @@ static void connect_samr_recv_auth_bind(struct composite_context *ctx)
 static void connect_samr_recv_conn(struct rpc_request *req)
 {
 	struct connect_samr_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct connect_samr_state);
 
 	state->ctx->status = dcerpc_ndr_request_recv(req);
@@ -204,7 +204,7 @@ static void connect_samr_recv_conn(struct rpc_request *req)
 static void connect_samr_recv_open(struct rpc_request *req)
 {
 	struct connect_samr_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct connect_samr_state);
 
 	state->ctx->status = dcerpc_ndr_request_recv(req);
diff --git a/source4/winbind/wb_dom_info_trusted.c b/source4/winbind/wb_dom_info_trusted.c
index e0d074270c..57e7b05dbe 100644
--- a/source4/winbind/wb_dom_info_trusted.c
+++ b/source4/winbind/wb_dom_info_trusted.c
@@ -117,7 +117,7 @@ static void trusted_dom_info_recv_domain(struct composite_context *ctx)
 static void trusted_dom_info_recv_dsr(struct rpc_request *req)
 {
 	struct trusted_dom_info_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct trusted_dom_info_state);
 
 	state->ctx->status = dcerpc_ndr_request_recv(req);
@@ -171,7 +171,7 @@ static void trusted_dom_info_recv_dsr(struct rpc_request *req)
 static void trusted_dom_info_recv_dcname(struct rpc_request *req)
 {
 	struct trusted_dom_info_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct trusted_dom_info_state);
 	struct composite_context *ctx;
 	struct nbt_name name;
diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index 5d868cd432..3f28c31372 100644
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -259,7 +259,7 @@ static void init_domain_recv_lsa(struct composite_context *ctx)
 static void init_domain_recv_queryinfo(struct rpc_request *req)
 {
 	struct init_domain_state *state =
-		talloc_get_type(req->async.private, struct init_domain_state);
+		talloc_get_type(req->async.private_data, struct init_domain_state);
 	struct lsa_DomainInfo *dominfo;
 	struct composite_context *ctx;
 	const char *ldap_url;
diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c
index c89870c3a2..6c8e9430bb 100644
--- a/source4/winbind/wb_pam_auth.c
+++ b/source4/winbind/wb_pam_auth.c
@@ -180,7 +180,7 @@ static void pam_auth_crap_recv_domain(struct composite_context *ctx)
 static void pam_auth_crap_recv_samlogon(struct rpc_request *req)
 {
 	struct pam_auth_crap_state *state =
-		talloc_get_type(req->async.private,
+		talloc_get_type(req->async.private_data,
 				struct pam_auth_crap_state);
 	struct netr_SamBaseInfo *base;
 	DATA_BLOB tmp_blob;
diff --git a/source4/winbind/wb_sam_logon.c b/source4/winbind/wb_sam_logon.c
index 683773c76e..f2e3fc642a 100644
--- a/source4/winbind/wb_sam_logon.c
+++ b/source4/winbind/wb_sam_logon.c
@@ -121,7 +121,7 @@ static void wb_sam_logon_recv_domain(struct composite_context *creq)
 */
 static void wb_sam_logon_recv_samlogon(struct rpc_request *req)
 {
-	struct wb_sam_logon_state *s = talloc_get_type(req->async.private,
+	struct wb_sam_logon_state *s = talloc_get_type(req->async.private_data,
 				       struct wb_sam_logon_state);
 
 	s->ctx->status = dcerpc_ndr_request_recv(req);