summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2017-07-22 22:00:59 +1200
committerStefan Metzmacher <metze@samba.org>2017-07-23 12:32:49 +0200
commitf1e4ae9971e61f7c4a43ae0049a1162cc2e3dafb (patch)
tree277ec52a7e3b4ada6b5f50d2a75b72a0b8783d88 /source4
parent890137cffedcaf88a9ff808c01335ee14fcfd8da (diff)
downloadsamba-f1e4ae9971e61f7c4a43ae0049a1162cc2e3dafb.tar.gz
s4-drepl: Block GetNCChanges during a DsReplicaSync
If we do not block these, we can get RPC faults (DCERPC_NCA_S_PROTO_ERROR) which gives WERR_WRITE_FAULT back to the DsReplicaSync call as there are two outstanding requests on the wire at the one time. We will get to the next operation as soon as this is finished when we call run_pending_ops(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=12926 Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Sun Jul 23 12:32:49 CEST 2017 on sn-devel-144
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/repl/drepl_out_pull.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c
index 8af64124e89..8b8ecd90d89 100644
--- a/source4/dsdb/repl/drepl_out_pull.c
+++ b/source4/dsdb/repl/drepl_out_pull.c
@@ -198,7 +198,7 @@ void dreplsrv_run_pull_ops(struct dreplsrv_service *s)
struct tevent_req *subreq;
WERROR werr;
- if (s->ops.current) {
+ if (s->ops.n_current || s->ops.current) {
/* if there's still one running, we're done */
return;
}