s4:irpc: avoid c++ reserved word 'private'

metze

13 files changed, 30 insertions, 27 deletions

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index db824db86c..48ef5c50d2 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -566,7 +566,7 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
 	struct PAC_Validate pac_validate;
 	DATA_BLOB srv_sig;
 	struct PAC_SIGNATURE_DATA kdc_sig;
-	struct kdc_server *kdc = talloc_get_type(msg->private, struct kdc_server);
+	struct kdc_server *kdc = talloc_get_type(msg->private_data, struct kdc_server);
 	enum ndr_err_code ndr_err;
 	krb5_enctype etype;
 	int ret;
diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h
index 9be8461f6a..3c518828ab 100644
--- a/source4/lib/messaging/irpc.h
+++ b/source4/lib/messaging/irpc.h
@@ -30,7 +30,7 @@
 */
 struct irpc_message {
 	struct server_id from;
-	void *private;
+	void *private_data;
 	struct irpc_header header;
 	struct ndr_pull *ndr;
 	bool defer_reply;
@@ -76,7 +76,7 @@ struct irpc_request {
 	TALLOC_CTX *mem_ctx;
 	struct {
 		void (*fn)(struct irpc_request *);
-		void *private;
+		void *private_data;
 	} async;
 };
 
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index c27f977cce..cfceeffac7 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -109,7 +109,7 @@ static void ping_message(struct messaging_context *msg, void *private_data,
 static NTSTATUS irpc_uptime(struct irpc_message *msg, 
 			    struct irpc_uptime *r)
 {
-	struct messaging_context *ctx = talloc_get_type(msg->private, struct messaging_context);
+	struct messaging_context *ctx = talloc_get_type(msg->private_data, struct messaging_context);
 	*r->out.start_time = timeval_to_nttime(&ctx->start_time);
 	return NT_STATUS_OK;
 }
@@ -768,7 +768,7 @@ static void irpc_handler_request(struct messaging_context *msg_ctx,
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) goto failed;
 
 	/* make the call */
-	m->private     = i->private_data;
+	m->private_data= i->private_data;
 	m->defer_reply = false;
 	m->msg_ctx     = msg_ctx;
 	m->irpc        = i;
diff --git a/source4/lib/messaging/tests/irpc.c b/source4/lib/messaging/tests/irpc.c
index 42a811d116..3eb23e0f7d 100644
--- a/source4/lib/messaging/tests/irpc.c
+++ b/source4/lib/messaging/tests/irpc.c
@@ -145,7 +145,7 @@ static bool test_echodata(struct torture_context *tctx,
 static void irpc_callback(struct irpc_request *irpc)
 {
 	struct echo_AddOne *r = (struct echo_AddOne *)irpc->r;
-	int *pong_count = (int *)irpc->async.private;
+	int *pong_count = (int *)irpc->async.private_data;
 	NTSTATUS status = irpc_call_recv(irpc);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("irpc call failed - %s\n", nt_errstr(status));
@@ -186,7 +186,7 @@ static bool test_speed(struct torture_context *tctx,
 		torture_assert(tctx, irpc != NULL, "AddOne send failed");
 
 		irpc->async.fn = irpc_callback;
-		irpc->async.private = &pong_count;
+		irpc->async.private_data = &pong_count;
 
 		ping_count++;
 
diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c
index aff8f79481..a6b1c68d1c 100644
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -184,7 +184,7 @@ _PUBLIC_ void composite_continue_irpc(struct composite_context *ctx,
 {
 	if (composite_nomem(new_req, ctx)) return;
 	new_req->async.fn = continuation;
-	new_req->async.private = private_data;
+	new_req->async.private_data = private_data;
 }
 
 _PUBLIC_ void composite_continue_smb(struct composite_context *ctx,
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 6e531391a6..2e4fad9332 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -174,7 +174,7 @@ static void finddcs_name_resolved(struct composite_context *ctx)
 static void finddcs_getdc_replied(struct irpc_request *ireq)
 {
 	struct finddcs_state *state =
-		talloc_get_type(ireq->async.private, struct finddcs_state);
+		talloc_get_type(ireq->async.private_data, struct finddcs_state);
 
 	state->ctx->status = irpc_call_recv(ireq);
 	if (!composite_is_ok(state->ctx)) return;
diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c
index b881e32f7b..da7d678da9 100644
--- a/source4/libcli/wbclient/wbclient.c
+++ b/source4/libcli/wbclient/wbclient.c
@@ -117,7 +117,7 @@ struct composite_context *wbc_sids_to_xids_send(struct wbc_context *wbc_ctx,
 static void sids_to_xids_recv_ids(struct irpc_request *req)
 {
 	struct wbc_idmap_state *state = talloc_get_type_abort(
-							req->async.private,
+							req->async.private_data,
 							struct wbc_idmap_state);
 
 	state->ctx->status = irpc_call_recv(state->irpc_req);
@@ -183,7 +183,7 @@ struct composite_context *wbc_xids_to_sids_send(struct wbc_context *wbc_ctx,
 static void xids_to_sids_recv_ids(struct irpc_request *req)
 {
 	struct wbc_idmap_state *state = talloc_get_type_abort(
-							req->async.private,
+							req->async.private_data,
 							struct wbc_idmap_state);
 
 	state->ctx->status = irpc_call_recv(state->irpc_req);
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index fc61372ead..748f18dcfd 100644
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -36,7 +36,8 @@
 static NTSTATUS nbtd_information(struct irpc_message *msg, 
 				 struct nbtd_information *r)
 {
-	struct nbtd_server *server = talloc_get_type(msg->private, struct nbtd_server);
+	struct nbtd_server *server = talloc_get_type(msg->private_data,
+						     struct nbtd_server);
 
 	switch (r->in.level) {
 	case NBTD_INFO_STATISTICS:
@@ -111,7 +112,7 @@ static NTSTATUS nbtd_getdcname(struct irpc_message *msg,
 			       struct nbtd_getdcname *req)
 {
 	struct nbtd_server *server =
-		talloc_get_type(msg->private, struct nbtd_server);
+		talloc_get_type(msg->private_data, struct nbtd_server);
 	struct nbtd_interface *iface = nbtd_find_request_iface(server, req->in.ip_address, true);
 	struct getdc_state *s;
 	struct nbt_netlogon_packet p;
diff --git a/source4/nbt_server/wins/winswack.c b/source4/nbt_server/wins/winswack.c
index c499889f9e..c53fa1d069 100644
--- a/source4/nbt_server/wins/winswack.c
+++ b/source4/nbt_server/wins/winswack.c
@@ -295,7 +295,7 @@ NTSTATUS nbtd_proxy_wins_challenge(struct irpc_message *msg,
 				   struct nbtd_proxy_wins_challenge *req)
 {
 	struct nbtd_server *nbtd_server =
-		talloc_get_type(msg->private, struct nbtd_server);
+		talloc_get_type(msg->private_data, struct nbtd_server);
 	struct proxy_wins_challenge_state *s;
 	uint32_t i;
 
@@ -355,7 +355,7 @@ NTSTATUS nbtd_proxy_wins_release_demand(struct irpc_message *msg,
 				   struct nbtd_proxy_wins_release_demand *req)
 {
 	struct nbtd_server *nbtd_server =
-		talloc_get_type(msg->private, struct nbtd_server);
+		talloc_get_type(msg->private_data, struct nbtd_server);
 	struct proxy_wins_release_demand_state *s;
 	uint32_t i;
 
diff --git a/source4/smb_server/management.c b/source4/smb_server/management.c
index 4306b22c30..e58c278613 100644
--- a/source4/smb_server/management.c
+++ b/source4/smb_server/management.c
@@ -32,7 +32,8 @@
 static NTSTATUS smbsrv_session_information(struct irpc_message *msg, 
 					   struct smbsrv_information *r)
 {
-	struct smbsrv_connection *smb_conn = talloc_get_type(msg->private, struct smbsrv_connection);
+	struct smbsrv_connection *smb_conn = talloc_get_type(msg->private_data,
+					     struct smbsrv_connection);
 	int i=0, count=0;
 	struct smbsrv_session *sess;
 
@@ -75,7 +76,8 @@ static NTSTATUS smbsrv_session_information(struct irpc_message *msg,
 static NTSTATUS smbsrv_tcon_information(struct irpc_message *msg, 
 					struct smbsrv_information *r)
 {
-	struct smbsrv_connection *smb_conn = talloc_get_type(msg->private, struct smbsrv_connection);
+	struct smbsrv_connection *smb_conn = talloc_get_type(msg->private_data,
+					     struct smbsrv_connection);
 	int i=0, count=0;
 	struct smbsrv_tcon *tcon;
 
diff --git a/source4/winbind/wb_irpc.c b/source4/winbind/wb_irpc.c
index 0535045adb..42f4e7c94b 100644
--- a/source4/winbind/wb_irpc.c
+++ b/source4/winbind/wb_irpc.c
@@ -36,7 +36,7 @@ static void wb_irpc_SamLogon_callback(struct composite_context *ctx);
 static NTSTATUS wb_irpc_SamLogon(struct irpc_message *msg, 
 				 struct winbind_SamLogon *req)
 {
-	struct wbsrv_service *service = talloc_get_type(msg->private,
+	struct wbsrv_service *service = talloc_get_type(msg->private_data,
 					struct wbsrv_service);
 	struct wb_irpc_SamLogon_state *s;
 	struct composite_context *ctx;
@@ -83,7 +83,7 @@ static void wb_irpc_get_idmap_callback(struct composite_context *ctx);
 static NTSTATUS wb_irpc_get_idmap(struct irpc_message *msg,
 				  struct winbind_get_idmap *req)
 {
-	struct wbsrv_service *service = talloc_get_type(msg->private,
+	struct wbsrv_service *service = talloc_get_type(msg->private_data,
 					struct wbsrv_service);
 	struct wb_irpc_get_idmap_state *s;
 	struct composite_context *ctx;
diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index 96a6033b1e..e6ff9a03bf 100644
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -893,7 +893,7 @@ struct r_do_challenge_state {
 static void r_do_late_release_demand_handler(struct irpc_request *ireq)
 {
 	NTSTATUS status;
-	struct r_do_challenge_state *state = talloc_get_type(ireq->async.private,
+	struct r_do_challenge_state *state = talloc_get_type(ireq->async.private_data,
 							     struct r_do_challenge_state);
 
 	status = irpc_call_recv(ireq);
@@ -931,7 +931,7 @@ static NTSTATUS r_do_late_release_demand(struct r_do_challenge_state *state)
 	NT_STATUS_HAVE_NO_MEMORY(ireq);
 
 	ireq->async.fn		= r_do_late_release_demand_handler;
-	ireq->async.private	= state;
+	ireq->async.private_data= state;
 
 	return NT_STATUS_OK;
 }
@@ -954,7 +954,7 @@ _UA_MA_DI_A<00>: C:BEST vs. B:BEST2 (C:ALL) => B:MHOMED => MHOMED_MERGE
 static void r_do_challenge_handler(struct irpc_request *ireq)
 {
 	NTSTATUS status;
-	struct r_do_challenge_state *state = talloc_get_type(ireq->async.private,
+	struct r_do_challenge_state *state = talloc_get_type(ireq->async.private_data,
 							     struct r_do_challenge_state);
 	bool old_is_subset = false;
 	bool new_is_subset = false;
@@ -1076,7 +1076,7 @@ static NTSTATUS r_do_challenge(struct wreplsrv_partner *partner,
 	NT_STATUS_HAVE_NO_MEMORY(ireq);
 
 	ireq->async.fn		= r_do_challenge_handler;
-	ireq->async.private	= state;
+	ireq->async.private_data= state;
 
 	talloc_steal(partner, state);
 	return NT_STATUS_OK;
@@ -1090,7 +1090,7 @@ struct r_do_release_demand_state {
 static void r_do_release_demand_handler(struct irpc_request *ireq)
 {
 	NTSTATUS status;
-	struct r_do_release_demand_state *state = talloc_get_type(ireq->async.private,
+	struct r_do_release_demand_state *state = talloc_get_type(ireq->async.private_data,
 						  struct r_do_release_demand_state);
 
 	status = irpc_call_recv(ireq);
@@ -1152,7 +1152,7 @@ static NTSTATUS r_do_release_demand(struct wreplsrv_partner *partner,
 	NT_STATUS_HAVE_NO_MEMORY(ireq);
 
 	ireq->async.fn		= r_do_release_demand_handler;
-	ireq->async.private	= state;
+	ireq->async.private_data= state;
 
 	talloc_steal(partner, state);
 	return NT_STATUS_OK;
diff --git a/source4/wrepl_server/wrepl_scavenging.c b/source4/wrepl_server/wrepl_scavenging.c
index 9f6a49ef09..8fc7d0a6f0 100644
--- a/source4/wrepl_server/wrepl_scavenging.c
+++ b/source4/wrepl_server/wrepl_scavenging.c
@@ -314,7 +314,7 @@ struct verify_state {
 
 static void verify_handler(struct irpc_request *ireq)
 {
-	struct verify_state *s = talloc_get_type(ireq->async.private,
+	struct verify_state *s = talloc_get_type(ireq->async.private_data,
 				 struct verify_state);
 	struct winsdb_record *rec = s->rec;
 	const char *action;
@@ -495,7 +495,7 @@ static NTSTATUS wreplsrv_scavenging_replica_active_records(struct wreplsrv_servi
 		NT_STATUS_HAVE_NO_MEMORY(ireq);
 
 		ireq->async.fn		= verify_handler;
-		ireq->async.private	= s;
+		ireq->async.private_data= s;
 
 		talloc_steal(service, s);
 	}