#include "../lib/util/tevent_ntstatus.h"
struct dreplsrv_out_drsuapi_state {
+ struct tevent_context *ev;
+
struct dreplsrv_out_connection *conn;
struct dreplsrv_drsuapi_connection *drsuapi;
return NULL;
}
+ state->ev = ev;
state->conn = conn;
state->drsuapi = conn->drsuapi;
return req;
}
-static void dreplsrv_out_drsuapi_bind_done(struct rpc_request *rreq);
+static void dreplsrv_out_drsuapi_bind_done(struct tevent_req *subreq);
static void dreplsrv_out_drsuapi_connect_done(struct composite_context *creq)
{
struct dreplsrv_out_drsuapi_state *state = tevent_req_data(req,
struct dreplsrv_out_drsuapi_state);
NTSTATUS status;
- struct rpc_request *rreq;
+ struct tevent_req *subreq;
status = dcerpc_pipe_connect_b_recv(creq,
state->drsuapi,
return;
}
+ state->drsuapi->drsuapi_handle = state->drsuapi->pipe->binding_handle;
+
status = gensec_session_key(state->drsuapi->pipe->conn->security_state.generic_state,
&state->drsuapi->gensec_skey);
if (tevent_req_nterror(req, status)) {
state->bind_r.in.bind_info = &state->bind_info_ctr;
state->bind_r.out.bind_handle = &state->drsuapi->bind_handle;
- rreq = dcerpc_drsuapi_DsBind_send(state->drsuapi->pipe,
- state,
- &state->bind_r);
- if (tevent_req_nomem(rreq, req)) {
+ subreq = dcerpc_drsuapi_DsBind_r_send(state,
+ state->ev,
+ state->drsuapi->drsuapi_handle,
+ &state->bind_r);
+ if (tevent_req_nomem(subreq, req)) {
return;
}
- composite_continue_rpc(NULL, rreq, dreplsrv_out_drsuapi_bind_done, req);
+ tevent_req_set_callback(subreq, dreplsrv_out_drsuapi_bind_done, req);
}
-static void dreplsrv_out_drsuapi_bind_done(struct rpc_request *rreq)
+static void dreplsrv_out_drsuapi_bind_done(struct tevent_req *subreq)
{
- struct tevent_req *req = talloc_get_type(rreq->async.private_data,
- struct tevent_req);
+ struct tevent_req *req = tevent_req_callback_data(subreq,
+ struct tevent_req);
struct dreplsrv_out_drsuapi_state *state = tevent_req_data(req,
struct dreplsrv_out_drsuapi_state);
NTSTATUS status;
- status = dcerpc_drsuapi_DsBind_recv(rreq);
+ status = dcerpc_drsuapi_DsBind_r_recv(subreq, state);
+ TALLOC_FREE(subreq);
if (tevent_req_nterror(req, status)) {
return;
}
}
struct dreplsrv_op_pull_source_state {
+ struct tevent_context *ev;
struct dreplsrv_out_operation *op;
+ void *ndr_struct_ptr;
};
static void dreplsrv_op_pull_source_connect_done(struct tevent_req *subreq);
if (req == NULL) {
return NULL;
}
-
+ state->ev = ev;
state->op = op;
subreq = dreplsrv_out_drsuapi_send(state, ev, op->source_dsa->conn);
dreplsrv_op_pull_source_get_changes_trigger(req);
}
-static void dreplsrv_op_pull_source_get_changes_done(struct rpc_request *rreq);
+static void dreplsrv_op_pull_source_get_changes_done(struct tevent_req *subreq);
static void dreplsrv_op_pull_source_get_changes_trigger(struct tevent_req *req)
{
struct dreplsrv_service *service = state->op->service;
struct dreplsrv_partition *partition = state->op->source_dsa->partition;
struct dreplsrv_drsuapi_connection *drsuapi = state->op->source_dsa->conn->drsuapi;
- struct rpc_request *rreq;
struct drsuapi_DsGetNCChanges *r;
struct drsuapi_DsReplicaCursorCtrEx *uptodateness_vector;
+ struct tevent_req *subreq;
+
+ if ((rf1->replica_flags & DRSUAPI_DRS_WRIT_REP) == 0 &&
+ state->op->extended_op == DRSUAPI_EXOP_NONE) {
+ return;
+ }
r = talloc(state, struct drsuapi_DsGetNCChanges);
if (tevent_req_nomem(r, req)) {
return;
}
- r->out.level_out = talloc(r, int32_t);
+ r->out.level_out = talloc(r, uint32_t);
if (tevent_req_nomem(r->out.level_out, req)) {
return;
}
r->in.req->req5.fsmo_info = state->op->fsmo_info;
}
-#if 0
+#if 1
NDR_PRINT_IN_DEBUG(drsuapi_DsGetNCChanges, r);
#endif
- rreq = dcerpc_drsuapi_DsGetNCChanges_send(drsuapi->pipe, r, r);
- if (tevent_req_nomem(rreq, req)) {
+ state->ndr_struct_ptr = r;
+ subreq = dcerpc_drsuapi_DsGetNCChanges_r_send(state,
+ state->ev,
+ drsuapi->drsuapi_handle,
+ r);
+ if (tevent_req_nomem(subreq, req)) {
return;
}
- composite_continue_rpc(NULL, rreq, dreplsrv_op_pull_source_get_changes_done, req);
+ tevent_req_set_callback(subreq, dreplsrv_op_pull_source_get_changes_done, req);
}
static void dreplsrv_op_pull_source_apply_changes_trigger(struct tevent_req *req,
struct drsuapi_DsGetNCChangesCtr1 *ctr1,
struct drsuapi_DsGetNCChangesCtr6 *ctr6);
-static void dreplsrv_op_pull_source_get_changes_done(struct rpc_request *rreq)
+static void dreplsrv_op_pull_source_get_changes_done(struct tevent_req *subreq)
{
- struct tevent_req *req = talloc_get_type(rreq->async.private_data,
- struct tevent_req);
+ struct tevent_req *req = tevent_req_callback_data(subreq,
+ struct tevent_req);
+ struct dreplsrv_op_pull_source_state *state = tevent_req_data(req,
+ struct dreplsrv_op_pull_source_state);
NTSTATUS status;
- struct drsuapi_DsGetNCChanges *r = talloc_get_type(rreq->ndr.struct_ptr,
+ struct drsuapi_DsGetNCChanges *r = talloc_get_type(state->ndr_struct_ptr,
struct drsuapi_DsGetNCChanges);
uint32_t ctr_level = 0;
struct drsuapi_DsGetNCChangesCtr1 *ctr1 = NULL;
struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL;
- status = dcerpc_drsuapi_DsGetNCChanges_recv(rreq);
+ state->ndr_struct_ptr = NULL;
+
+ status = dcerpc_drsuapi_DsGetNCChanges_r_recv(subreq, r);
+ TALLOC_FREE(subreq);
if (tevent_req_nterror(req, status)) {
return;
}
+ NDR_PRINT_OUT_DEBUG(drsuapi_DsGetNCChanges, r);
+
if (!W_ERROR_IS_OK(r->out.result)) {
status = werror_to_ntstatus(r->out.result);
tevent_req_nterror(req, status);
we join the domain, but they quickly expire. We do it here
so we can use the already established DRSUAPI pipe
*/
- dreplsrv_update_refs_trigger(req);
+ if (state->op->extended_op == DRSUAPI_EXOP_NONE) {
+ dreplsrv_update_refs_trigger(req);
+ } else {
+ tevent_req_done(req);
+ }
}
-static void dreplsrv_update_refs_done(struct rpc_request *rreq);
+static void dreplsrv_update_refs_done(struct tevent_req *subreq);
/*
send a UpdateRefs request to refresh our repsTo record on the server
struct dreplsrv_service *service = state->op->service;
struct dreplsrv_partition *partition = state->op->source_dsa->partition;
struct dreplsrv_drsuapi_connection *drsuapi = state->op->source_dsa->conn->drsuapi;
- struct rpc_request *rreq;
struct drsuapi_DsReplicaUpdateRefs *r;
char *ntds_guid_str;
char *ntds_dns_name;
+ struct tevent_req *subreq;
+ bool am_rodc;
+ int ret;
r = talloc(state, struct drsuapi_DsReplicaUpdateRefs);
if (tevent_req_nomem(r, req)) {
r->in.req.req1.dest_dsa_dns_name = ntds_dns_name;
r->in.req.req1.dest_dsa_guid = service->ntds_guid;
r->in.req.req1.options = DRSUAPI_DRS_ADD_REF | DRSUAPI_DRS_DEL_REF;
- if (!samdb_rodc(service->samdb)) {
+ ret = samdb_rodc(service->samdb, &am_rodc);
+ if (ret == LDB_SUCCESS && !am_rodc) {
r->in.req.req1.options |= DRSUAPI_DRS_WRIT_REP;
}
- rreq = dcerpc_drsuapi_DsReplicaUpdateRefs_send(drsuapi->pipe, r, r);
- if (tevent_req_nomem(rreq, req)) {
+ state->ndr_struct_ptr = r;
+ subreq = dcerpc_drsuapi_DsReplicaUpdateRefs_r_send(state,
+ state->ev,
+ drsuapi->drsuapi_handle,
+ r);
+ if (tevent_req_nomem(subreq, req)) {
return;
}
- composite_continue_rpc(NULL, rreq, dreplsrv_update_refs_done, req);
+ tevent_req_set_callback(subreq, dreplsrv_update_refs_done, req);
}
/*
receive a UpdateRefs reply
*/
-static void dreplsrv_update_refs_done(struct rpc_request *rreq)
+static void dreplsrv_update_refs_done(struct tevent_req *subreq)
{
- struct tevent_req *req = talloc_get_type(rreq->async.private_data,
+ struct tevent_req *req = tevent_req_callback_data(subreq,
struct tevent_req);
- struct drsuapi_DsReplicaUpdateRefs *r = talloc_get_type(rreq->ndr.struct_ptr,
+ struct dreplsrv_op_pull_source_state *state = tevent_req_data(req,
+ struct dreplsrv_op_pull_source_state);
+ struct drsuapi_DsReplicaUpdateRefs *r = talloc_get_type(state->ndr_struct_ptr,
struct drsuapi_DsReplicaUpdateRefs);
NTSTATUS status;
- status = dcerpc_drsuapi_DsReplicaUpdateRefs_recv(rreq);
+ state->ndr_struct_ptr = NULL;
+
+ status = dcerpc_drsuapi_DsReplicaUpdateRefs_r_recv(subreq, r);
+ TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("UpdateRefs failed with %s\n",
nt_errstr(status)));
git.samba.org / metze / samba / wip.git / blobdiff