s4-drepl: switch drepl over to using the generic DRS options flags

WSPP uses a single set of flags for all these DRS operations.

diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c
index 84d9eacab32a1e192d9f614e90761792d9dbb992..4681d5afdfcbcd456c08c8134b6cec860a303957 100644 (file)
--- 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 a4f5d1faec643c9d6a9b44c1494e410f497013aa..7b819ac4c3b7a18444fa46763484ba4ca08e5b21 100644 (file)
--- 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);