summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-01-14 14:37:22 +1100
committerAndrew Tridgell <tridge@samba.org>2010-01-14 15:37:59 +1100
commit88ec10b7576b8767b370db1c27ffe703eae852c3 (patch)
treea32af9201a27c3db09e2a7c327d4680694f97b11
parent60c5a5f39f6b5b709d3ecf97cbaed68f12181941 (diff)
downloadsamba-88ec10b7576b8767b370db1c27ffe703eae852c3.tar.gz
samba-88ec10b7576b8767b370db1c27ffe703eae852c3.tar.bz2
samba-88ec10b7576b8767b370db1c27ffe703eae852c3.zip
s4-drepl: switch drepl over to using the generic DRS options flags
WSPP uses a single set of flags for all these DRS operations.
-rw-r--r--source4/dsdb/repl/drepl_notify.c6
-rw-r--r--source4/dsdb/repl/drepl_out_helpers.c6
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);