summaryrefslogtreecommitdiff
path: root/source4/dsdb/repl/drepl_fsmo.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-09-15 18:59:17 +1000
committerAndrew Tridgell <tridge@samba.org>2010-09-16 07:24:01 +1000
commitd5673b5501225e295bae2a5c0084cf3ce5582dca (patch)
treeba4062891a49a3ac9e2f2a8698a1aea37a01535f /source4/dsdb/repl/drepl_fsmo.c
parentaabd89d8f7d80d614c941111d7a049f9f35b943b (diff)
downloadsamba-d5673b5501225e295bae2a5c0084cf3ce5582dca.tar.gz
samba-d5673b5501225e295bae2a5c0084cf3ce5582dca.tar.bz2
samba-d5673b5501225e295bae2a5c0084cf3ce5582dca.zip
s4-repl: cleanup the extended op calls in repl server
- use generic parameter names - trigger a run of pending ops on all extended ops - don't prevent parallel fsmo transfers - moved extended op code into drepl_extended
Diffstat (limited to 'source4/dsdb/repl/drepl_fsmo.c')
-rw-r--r--source4/dsdb/repl/drepl_fsmo.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/source4/dsdb/repl/drepl_fsmo.c b/source4/dsdb/repl/drepl_fsmo.c
index 63b831669a..dc7fe27b01 100644
--- a/source4/dsdb/repl/drepl_fsmo.c
+++ b/source4/dsdb/repl/drepl_fsmo.c
@@ -43,7 +43,6 @@ static void drepl_role_callback(struct dreplsrv_service *service,
} else {
DEBUG(0,(__location__ ": Successful role transfer\n"));
}
- service->role_transfer_in_progress = false;
}
static bool fsmo_master_cmp(struct ldb_dn *ntds_dn, struct ldb_dn *role_owner_dn)
@@ -69,12 +68,6 @@ WERROR dreplsrv_fsmo_role_check(struct dreplsrv_service *service,
enum drsuapi_DsExtendedOperation extended_op = DRSUAPI_EXOP_NONE;
WERROR werr;
- if (service->role_transfer_in_progress) {
- talloc_free(tmp_ctx);
- /* should we allow these in parallel? */
- return WERR_DS_DRA_REPL_PENDING;
- }
-
ntds_dn = samdb_ntds_settings_dn(ldb);
if (!ntds_dn) {
return WERR_DS_DRA_INTERNAL_ERROR;