r22944: fix bug #4618:

rename private -> private_data

metze
(This used to be commit 58551f2f28fce8f1fcd04736c47ecd7458f32ea2)

10 files changed, 21 insertions, 21 deletions

diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index 91e80e8cc5b..88cf835faae 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 0696ff55720..ff92b6d663b 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 4635f23312e..c39fe499a7c 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 aa8a9ea9c00..1bde29f2097 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 5a72e599548..219865b78c8 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 a14b7bd83b2..4423e3e91d8 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 e0d074270cb..57e7b05dbe8 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 5d868cd4327..3f28c313723 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 c89870c3a28..6c8e9430bbc 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 683773c76ed..f2e3fc642a8 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);