dsdb: Do not hold the transaction over the IRPC call to perform a role transfer

This avoids one samba process locking out another from the DB.

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index bdeb92bbc4c52317395817b4c554356d4736dff4..39485af9d7323e6f65eacc30bfaf7d40601fc8bf 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -135,7 +135,6 @@
 ^samba4.smb2.acls.*.owner
 ^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
 #^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.*
-^samba4.drs.fsmo.python
 ^samba4.libsmbclient.opendir.opendir # This requires netbios browsing
 ^samba4.rpc.drsuapi.*.drsuapi.DsGetDomainControllerInfo\(.*\)$
 ^samba4.rpc.drsuapi.*.drsuapi.DsCrackNames\(.*\)$

diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index add83d293af7ac4fc452707d9b157e1584b99c40..eaf64517d98432ec81524167b8daf91ee36bf4f0 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -1297,6 +1297,7 @@ static int rootdse_add(struct ldb_module *module, struct ldb_request *req)
 struct fsmo_transfer_state {
        struct ldb_context *ldb;
        struct ldb_request *req;
+       struct ldb_module *module;
 };
 
 /*
@@ -1307,6 +1308,7 @@ static void rootdse_fsmo_transfer_callback(struct tevent_req *treq)
        struct fsmo_transfer_state *fsmo = tevent_req_callback_data(treq, struct fsmo_transfer_state);
        NTSTATUS status;
        WERROR werr;
+       int ret;
        struct ldb_request *req = fsmo->req;
        struct ldb_context *ldb = fsmo->ldb;
 
@@ -1314,16 +1316,31 @@ static void rootdse_fsmo_transfer_callback(struct tevent_req *treq)
        talloc_free(fsmo);
        if (!NT_STATUS_IS_OK(status)) {
                ldb_asprintf_errstring(ldb, "Failed FSMO transfer: %s", nt_errstr(status));
+               /*
+                * Now that it is failed, start the transaction up
+                * again so the wrappers can close it without additional error
+                */
+               ldb_next_start_trans(fsmo->module);
                ldb_module_done(req, NULL, NULL, LDB_ERR_UNAVAILABLE);
                return;
        }
        if (!W_ERROR_IS_OK(werr)) {
                ldb_asprintf_errstring(ldb, "Failed FSMO transfer: %s", win_errstr(werr));
+               /*
+                * Now that it is failed, start the transaction up
+                * again so the wrappers can close it without additional error
+                */
+               ldb_next_start_trans(fsmo->module);
                ldb_module_done(req, NULL, NULL, LDB_ERR_UNAVAILABLE);
                return;
        }
 
-       ldb_module_done(req, NULL, NULL, LDB_SUCCESS);
+       /*
+        * Now that it is done, start the transaction up again so the
+        * wrappers can close it without error
+        */
+       ret = ldb_next_start_trans(fsmo->module);
+       ldb_module_done(req, NULL, NULL, ret);
 }
 
 static int rootdse_become_master(struct ldb_module *module,
@@ -1358,6 +1375,13 @@ static int rootdse_become_master(struct ldb_module *module,
                                 "RODC cannot become a role master.");
        }
 
+       /*
+        * We always delete the transaction, not commit it, because
+        * this gives the least supprise to this supprising action (as
+        * we will never record anything done to this point
+        */
+       ldb_next_del_trans(module);
+
        msg = imessaging_client_init(tmp_ctx, lp_ctx,
                                    ldb_get_event_context(ldb));
        if (!msg) {
@@ -1376,6 +1400,7 @@ static int rootdse_become_master(struct ldb_module *module,
        }
        fsmo->ldb = ldb;
        fsmo->req = req;
+       fsmo->module = module;
 
        /*
         * we send the call asynchronously, as the ldap client is