summaryrefslogtreecommitdiff
path: root/source4/wrepl_server
diff options
context:
space:
mode:
Diffstat (limited to 'source4/wrepl_server')
-rw-r--r--source4/wrepl_server/wrepl_apply_records.c12
-rw-r--r--source4/wrepl_server/wrepl_in_connection.c16
-rw-r--r--source4/wrepl_server/wrepl_out_helpers.c20
-rw-r--r--source4/wrepl_server/wrepl_scavenging.c4
-rw-r--r--source4/wrepl_server/wrepl_server.c2
5 files changed, 27 insertions, 27 deletions
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_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index ecc265e590..e6a69b829a 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -47,9 +47,9 @@ static int terminate_after_send_destructor(struct wreplsrv_in_connection **tas)
/*
receive some data on a WREPL connection
*/
-static NTSTATUS wreplsrv_recv_request(void *private, DATA_BLOB blob)
+static NTSTATUS wreplsrv_recv_request(void *private_data, DATA_BLOB blob)
{
- struct wreplsrv_in_connection *wreplconn = talloc_get_type(private, struct wreplsrv_in_connection);
+ struct wreplsrv_in_connection *wreplconn = talloc_get_type(private_data, struct wreplsrv_in_connection);
struct wreplsrv_in_call *call;
DATA_BLOB packet_in_blob;
DATA_BLOB packet_out_blob;
@@ -123,7 +123,7 @@ static NTSTATUS wreplsrv_recv_request(void *private, DATA_BLOB blob)
*/
static void wreplsrv_recv(struct stream_connection *conn, uint16_t flags)
{
- struct wreplsrv_in_connection *wreplconn = talloc_get_type(conn->private,
+ struct wreplsrv_in_connection *wreplconn = talloc_get_type(conn->private_data,
struct wreplsrv_in_connection);
packet_recv(wreplconn->packet);
@@ -134,7 +134,7 @@ static void wreplsrv_recv(struct stream_connection *conn, uint16_t flags)
*/
static void wreplsrv_send(struct stream_connection *conn, uint16_t flags)
{
- struct wreplsrv_in_connection *wreplconn = talloc_get_type(conn->private,
+ struct wreplsrv_in_connection *wreplconn = talloc_get_type(conn->private_data,
struct wreplsrv_in_connection);
packet_queue_run(wreplconn->packet);
}
@@ -142,9 +142,9 @@ static void wreplsrv_send(struct stream_connection *conn, uint16_t flags)
/*
handle socket recv errors
*/
-static void wreplsrv_recv_error(void *private, NTSTATUS status)
+static void wreplsrv_recv_error(void *private_data, NTSTATUS status)
{
- struct wreplsrv_in_connection *wreplconn = talloc_get_type(private,
+ struct wreplsrv_in_connection *wreplconn = talloc_get_type(private_data,
struct wreplsrv_in_connection);
wreplsrv_terminate_in_connection(wreplconn, nt_errstr(status));
}
@@ -154,7 +154,7 @@ static void wreplsrv_recv_error(void *private, NTSTATUS status)
*/
static void wreplsrv_accept(struct stream_connection *conn)
{
- struct wreplsrv_service *service = talloc_get_type(conn->private, struct wreplsrv_service);
+ struct wreplsrv_service *service = talloc_get_type(conn->private_data, struct wreplsrv_service);
struct wreplsrv_in_connection *wreplconn;
struct socket_address *peer_ip;
@@ -189,7 +189,7 @@ static void wreplsrv_accept(struct stream_connection *conn)
wreplconn->partner = wreplsrv_find_partner(service, peer_ip->addr);
- conn->private = wreplconn;
+ conn->private_data = wreplconn;
irpc_add_name(conn->msg_ctx, "wreplsrv_connection");
}
diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c
index d9a9684c79..6aff134072 100644
--- a/source4/wrepl_server/wrepl_out_helpers.c
+++ b/source4/wrepl_server/wrepl_out_helpers.c
@@ -62,7 +62,7 @@ static NTSTATUS wreplsrv_out_connect_wait_socket(struct wreplsrv_out_connect_sta
NT_STATUS_HAVE_NO_MEMORY(state->req);
state->req->async.fn = wreplsrv_out_connect_handler_req;
- state->req->async.private = state;
+ state->req->async.private_data = state;
state->stage = WREPLSRV_OUT_CONNECT_STAGE_WAIT_ASSOC_CTX;
@@ -131,7 +131,7 @@ static void wreplsrv_out_connect_handler_creq(struct composite_context *creq)
static void wreplsrv_out_connect_handler_req(struct wrepl_request *req)
{
- struct wreplsrv_out_connect_state *state = talloc_get_type(req->async.private,
+ struct wreplsrv_out_connect_state *state = talloc_get_type(req->async.private_data,
struct wreplsrv_out_connect_state);
wreplsrv_out_connect_handler(state);
return;
@@ -276,7 +276,7 @@ static NTSTATUS wreplsrv_pull_table_wait_connection(struct wreplsrv_pull_table_s
NT_STATUS_HAVE_NO_MEMORY(state->req);
state->req->async.fn = wreplsrv_pull_table_handler_req;
- state->req->async.private = state;
+ state->req->async.private_data = state;
state->stage = WREPLSRV_PULL_TABLE_STAGE_WAIT_TABLE_REPLY;
@@ -330,7 +330,7 @@ static void wreplsrv_pull_table_handler_creq(struct composite_context *creq)
static void wreplsrv_pull_table_handler_req(struct wrepl_request *req)
{
- struct wreplsrv_pull_table_state *state = talloc_get_type(req->async.private,
+ struct wreplsrv_pull_table_state *state = talloc_get_type(req->async.private_data,
struct wreplsrv_pull_table_state);
wreplsrv_pull_table_handler(state);
return;
@@ -436,7 +436,7 @@ static NTSTATUS wreplsrv_pull_names_wait_connection(struct wreplsrv_pull_names_s
NT_STATUS_HAVE_NO_MEMORY(state->req);
state->req->async.fn = wreplsrv_pull_names_handler_req;
- state->req->async.private = state;
+ state->req->async.private_data = state;
state->stage = WREPLSRV_PULL_NAMES_STAGE_WAIT_SEND_REPLY;
@@ -490,7 +490,7 @@ static void wreplsrv_pull_names_handler_creq(struct composite_context *creq)
static void wreplsrv_pull_names_handler_req(struct wrepl_request *req)
{
- struct wreplsrv_pull_names_state *state = talloc_get_type(req->async.private,
+ struct wreplsrv_pull_names_state *state = talloc_get_type(req->async.private_data,
struct wreplsrv_pull_names_state);
wreplsrv_pull_names_handler(state);
return;
@@ -651,7 +651,7 @@ static NTSTATUS wreplsrv_pull_cycle_next_owner_wrapper(struct wreplsrv_pull_cycl
NT_STATUS_HAVE_NO_MEMORY(state->req);
state->req->async.fn = wreplsrv_pull_cycle_handler_req;
- state->req->async.private = state;
+ state->req->async.private_data = state;
state->stage = WREPLSRV_PULL_CYCLE_STAGE_WAIT_STOP_ASSOC;
}
@@ -773,7 +773,7 @@ static void wreplsrv_pull_cycle_handler_creq(struct composite_context *creq)
static void wreplsrv_pull_cycle_handler_req(struct wrepl_request *req)
{
- struct wreplsrv_pull_cycle_state *state = talloc_get_type(req->async.private,
+ struct wreplsrv_pull_cycle_state *state = talloc_get_type(req->async.private_data,
struct wreplsrv_pull_cycle_state);
wreplsrv_pull_cycle_handler(state);
return;
@@ -957,7 +957,7 @@ static NTSTATUS wreplsrv_push_notify_inform(struct wreplsrv_push_notify_state *s
NT_STATUS_HAVE_NO_MEMORY(state->req);
state->req->async.fn = wreplsrv_push_notify_handler_req;
- state->req->async.private = state;
+ state->req->async.private_data = state;
state->stage = WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_INFORM;
@@ -1056,7 +1056,7 @@ static void wreplsrv_push_notify_handler_creq(struct composite_context *creq)
static void wreplsrv_push_notify_handler_req(struct wrepl_request *req)
{
- struct wreplsrv_push_notify_state *state = talloc_get_type(req->async.private,
+ struct wreplsrv_push_notify_state *state = talloc_get_type(req->async.private_data,
struct wreplsrv_push_notify_state);
wreplsrv_push_notify_handler(state);
return;
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);
}
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 5e100f46cc..c8316a5f4c 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -464,7 +464,7 @@ static void wreplsrv_task_init(struct task_server *task)
}
service->task = task;
service->startup_time = timeval_current();
- task->private = service;
+ task->private_data = service;
/*
* setup up all partners, and open the winsdb
generated by cgit (git 2.34.1) at 2024-12-27 02:40:23 +0000