From 49deed5a77af0a774cf186c2332416fbf6bba05b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 8 Jul 2010 16:18:21 +0200 Subject: s4:drepl_out_helpers: don't return NT_STATUS_OK, if an extended operation doesn't return success metze --- source4/dsdb/repl/drepl_out_helpers.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'source4/dsdb') diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index 56e1257987..d8e5b76fb7 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -365,7 +365,7 @@ static void dreplsrv_op_pull_source_get_changes_done(struct tevent_req *subreq) uint32_t ctr_level = 0; struct drsuapi_DsGetNCChangesCtr1 *ctr1 = NULL; struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL; - + enum drsuapi_DsExtendedError extended_ret; state->ndr_struct_ptr = NULL; status = dcerpc_drsuapi_DsGetNCChanges_r_recv(subreq, r); @@ -420,6 +420,19 @@ static void dreplsrv_op_pull_source_get_changes_done(struct tevent_req *subreq) tevent_req_nterror(req, status); return; } + extended_ret = ctr6->extended_ret; + } + + if (ctr_level == 1) { + extended_ret = ctr1->extended_ret; + } + + if (state->op->extended_op != DRSUAPI_EXOP_NONE) { + if (extended_ret != DRSUAPI_EXOP_ERR_SUCCESS) { + status = NT_STATUS_UNSUCCESSFUL; + tevent_req_nterror(req, status); + return; + } } dreplsrv_op_pull_source_apply_changes_trigger(req, r, ctr_level, ctr1, ctr6); -- cgit