From 88ec10b7576b8767b370db1c27ffe703eae852c3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 14 Jan 2010 14:37:22 +1100 Subject: s4-drepl: switch drepl over to using the generic DRS options flags WSPP uses a single set of flags for all these DRS operations. --- source4/dsdb/repl/drepl_notify.c | 6 +++--- source4/dsdb/repl/drepl_out_helpers.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c index 84d9eacab3..4681d5afdf 100644 --- a/source4/dsdb/repl/drepl_notify.c +++ b/source4/dsdb/repl/drepl_notify.c @@ -110,9 +110,9 @@ static void dreplsrv_op_notify_replica_sync_trigger(struct tevent_req *req) r->in.req.req1.naming_context = &partition->nc; r->in.req.req1.source_dsa_guid = state->op->service->ntds_guid; r->in.req.req1.options = - DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION | - DRSUAPI_DS_REPLICA_SYNC_WRITEABLE | - DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES; + DRSUAPI_DRS_ASYNC_OP | + DRSUAPI_DRS_UPDATE_NOTIFICATION | + DRSUAPI_DRS_WRIT_REP; rreq = dcerpc_drsuapi_DsReplicaSync_send(drsuapi->pipe, r, r); if (tevent_req_nomem(rreq, req)) { diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index a4f5d1faec..7b819ac4c3 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -547,11 +547,9 @@ static void dreplsrv_update_refs_trigger(struct tevent_req *req) r->in.req.req1.naming_context = &partition->nc; 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_DS_REPLICA_UPDATE_ADD_REFERENCE | - DRSUAPI_DS_REPLICA_UPDATE_DELETE_REFERENCE; + r->in.req.req1.options = DRSUAPI_DRS_ADD_REF | DRSUAPI_DRS_DEL_REF; if (!samdb_rodc(service->task->lp_ctx)) { - r->in.req.req1.options |= DRSUAPI_DS_REPLICA_UPDATE_WRITEABLE; + r->in.req.req1.options |= DRSUAPI_DRS_WRIT_REP; } rreq = dcerpc_drsuapi_DsReplicaUpdateRefs_send(drsuapi->pipe, r, r); -- cgit