r22944: fix bug #4618:

rename private -> private_data

metze
(This used to be commit 58551f2f28fce8f1fcd04736c47ecd7458f32ea2)

8 files changed, 42 insertions, 42 deletions

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;