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

metze

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index db824db86ca4191b7a9eed141a206c9a4720aaa4..48ef5c50d24a59c9a492fa258083b9ce112363b2 100644 (file)
--- 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 9be8461f6a210a360923a5387680ca8ff1ab2753..3c518828ab77c4b408602e207d3518fd86954be1 100644 (file)
--- 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 c27f977cce694ca6e78328f2ea41835e455a2f97..cfceeffac71424c2a5169c42c75a64229c552ace 100644 (file)
--- 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 42a811d1161eaf71c3a08ff902d52340e2d9b363..3eb23e0f7d53c90681b4791736391fc3cceb466f 100644 (file)
--- 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 aff8f79481efe23d622b8a10323c7d30899dc182..a6b1c68d1c0219ba10717f1dbd29f4b82704b22c 100644 (file)
--- 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 6e531391a646ff2cb1d3c34e49ccb197f037c020..2e4fad93325fd1c5c90669279d31c61b5816a380 100644 (file)
--- 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 b881e32f7b9f721202e9974d034abd6b0acc82f3..da7d678da9621e680099af2712b5ad54c2f8f84a 100644 (file)
--- 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 fc61372ead8377b7be865f286fe75e0b3c267d52..748f18dcfdd0afbcda08bae28fa5911489c7f4c8 100644 (file)
--- 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 c499889f9e41ec6f56ccfbb3fe5a5edf204c8d78..c53fa1d069adce675ac92fe8aa19f673a88b476b 100644 (file)
--- 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 4306b22c30ed1f443f0b39171e75db913431f2a9..e58c2786134c0a3e16f28cf8f7ccf9a7e386e196 100644 (file)
--- 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 0535045adb200ebf7c9e6d8b57b9d189bf9a37d7..42f4e7c94b4625ec23c5383eb64e57c9b5ba2c5f 100644 (file)
--- 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 96a6033b1e16c618dc84772125c407ced6cb9feb..e6ff9a03bf84935c81289a1e800668562cc45d67 100644 (file)
--- 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 9f6a49ef09da0c3991d42f991fb97302bebff423..8fc7d0a6f0188f0cd567a963987bac097a64ee2d 100644 (file)
--- 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);
        }