From 3593298c7e095b0935bffe05e3b1e190abf91707 Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Wed, 8 Sep 2010 01:07:44 +0300 Subject: s4-dreplsrv: Call dreplsrv_out_operation::callback in case we fail to even run the operation Operation was scheduled already, so we need to call the callback function for it to be able to do its job. For instance, if we are blocking an rpc call until an operation is completed and there is no memory, then client will be blocked without knowing what is going on with the server. --- source4/dsdb/repl/drepl_out_pull.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c index a4a00b48e7..21f986ad7b 100644 --- a/source4/dsdb/repl/drepl_out_pull.c +++ b/source4/dsdb/repl/drepl_out_pull.c @@ -163,6 +163,14 @@ void dreplsrv_run_pending_ops(struct dreplsrv_service *s) rf->consecutive_sync_failures++; s->ops.current = NULL; + /* + * call the callback (if any) so it gets the chance + * to do its job just like in any other failure situation + */ + if (op->callback) { + op->callback(s, rf->result_last_attempt, op->extended_ret, op->cb_data); + } + DEBUG(1,("dreplsrv_op_pull_source(%s/%s) failures[%u]\n", win_errstr(rf->result_last_attempt), nt_errstr(werror_to_ntstatus(rf->result_last_attempt)), -- cgit