diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-02-01 00:03:47 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-02-01 00:17:20 +0100 |
| commit | 5f13710ced2565355c3cdcef04067cacdf74a9ad (patch) | |
| tree | 577f87ed1495048eba1f5321f94e11581a42aa5c /source4/wrepl_server | |
| parent | 96f176dbd84090fd18b8c796f869ddaa2da39e59 (diff) | |
| download | samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.gz samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.xz samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.zip | |
s4:irpc: avoid c++ reserved word 'private'
metze
Diffstat (limited to 'source4/wrepl_server')
| -rw-r--r-- | source4/wrepl_server/wrepl_apply_records.c | 12 | ||||
| -rw-r--r-- | source4/wrepl_server/wrepl_scavenging.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c index 96a6033b1e1..e6ff9a03bf8 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 9f6a49ef09d..8fc7d0a6f01 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); } |