diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-01-14 14:38:00 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-01-14 15:37:59 +1100 |
| commit | 2008d24e91ce38ac928a71d0dc5147ecca0f2b24 (patch) | |
| tree | 64d87124ed622116e517599b4979438c4cabf104 | |
| parent | a5d611706533bb23f11e4c10edad455e091b5073 (diff) | |
| download | samba-2008d24e91ce38ac928a71d0dc5147ecca0f2b24.tar.gz samba-2008d24e91ce38ac928a71d0dc5147ecca0f2b24.tar.bz2 samba-2008d24e91ce38ac928a71d0dc5147ecca0f2b24.zip | |
s4-drs: switch the DRS server to the generic DRS options flags
| -rw-r--r-- | source4/rpc_server/drsuapi/getncchanges.c | 6 | ||||
| -rw-r--r-- | source4/rpc_server/drsuapi/updaterefs.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index 908060a0dd..d9245b58f0 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -1052,9 +1052,9 @@ WERROR dcesrv_drsuapi_DsGetNCChanges(struct dcesrv_call_state *dce_call, TALLOC_ return WERR_NOMEM; } ureq.dest_dsa_guid = req8->destination_dsa_guid; - ureq.options = DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE | - DRSUAPI_DS_REPLICA_UPDATE_ASYNCHRONOUS_OPERATION | - DRSUAPI_DS_REPLICA_UPDATE_GETCHG_CHECK; + ureq.options = DRSUAPI_DRS_ADD_REF | + DRSUAPI_DRS_ASYNC_OP | + DRSUAPI_DRS_GETCHG_CHECK; werr = drsuapi_UpdateRefs(b_state, mem_ctx, &ureq); if (!W_ERROR_IS_OK(werr)) { DEBUG(0,(__location__ ": Failed UpdateRefs in DsGetNCChanges - %s\n", diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c index b1e3d6c352..2c2a972844 100644 --- a/source4/rpc_server/drsuapi/updaterefs.c +++ b/source4/rpc_server/drsuapi/updaterefs.c @@ -48,7 +48,7 @@ static WERROR uref_add_dest(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx, for (i=0; i<reps.count; i++) { if (GUID_compare(&dest->source_dsa_obj_guid, &reps.r[i].ctr.ctr1.source_dsa_obj_guid) == 0) { - if (options & DRSUAPI_DS_REPLICA_UPDATE_GETCHG_CHECK) { + if (options & DRSUAPI_DRS_GETCHG_CHECK) { return WERR_OK; } else { return WERR_DS_DRA_REF_ALREADY_EXISTS; @@ -106,8 +106,8 @@ static WERROR uref_del_dest(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx, } if (!found && - !(options & DRSUAPI_DS_REPLICA_UPDATE_GETCHG_CHECK) && - !(options & DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE)) { + !(options & DRSUAPI_DRS_GETCHG_CHECK) && + !(options & DRSUAPI_DRS_ADD_REF)) { return WERR_DS_DRA_REF_NOT_FOUND; } @@ -138,7 +138,7 @@ WERROR drsuapi_UpdateRefs(struct drsuapi_bind_state *b_state, TALLOC_CTX *mem_ct return WERR_DS_DRA_INTERNAL_ERROR; } - if (req->options & DRSUAPI_DS_REPLICA_UPDATE_DELETE_REFERENCE) { + if (req->options & DRSUAPI_DRS_DEL_REF) { werr = uref_del_dest(b_state->sam_ctx, mem_ctx, dn, &req->dest_dsa_guid, req->options); if (!W_ERROR_IS_OK(werr)) { DEBUG(0,("Failed to delete repsTo for %s\n", @@ -147,7 +147,7 @@ WERROR drsuapi_UpdateRefs(struct drsuapi_bind_state *b_state, TALLOC_CTX *mem_ct } } - if (req->options & DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE) { + if (req->options & DRSUAPI_DRS_ADD_REF) { struct repsFromTo1 dest; struct repsFromTo1OtherInfo oi; |