s4/fsmo: Naming master support added

Test suite for fsmo is extended with a test case for naming master too.

diff --git a/source4/dsdb/repl/drepl_fsmo.c b/source4/dsdb/repl/drepl_fsmo.c
index 375e37b517639a769b037b1f0b16e30578a6886f..650b299c1ddf4fe1333c15a4e099112655b5e93b 100644 (file)
--- a/source4/dsdb/repl/drepl_fsmo.c
+++ b/source4/dsdb/repl/drepl_fsmo.c
@@ -75,7 +75,7 @@ WERROR dreplsrv_fsmo_role_check(struct dreplsrv_service *service,
 
        switch (role) {
        case DREPL_NAMING_MASTER:
-               fsmo_role_dn = samdb_partitions_dn(ldb, tmp_ctx),
+               fsmo_role_dn = samdb_partitions_dn(ldb, tmp_ctx);
                ret = samdb_reference_dn(ldb, tmp_ctx, fsmo_role_dn, "fSMORoleOwner", &role_owner_dn);
                if (ret != LDB_SUCCESS) {
                        DEBUG(0,(__location__ ": Failed to find fSMORoleOwner in Naming Master object - %s",
@@ -83,6 +83,7 @@ WERROR dreplsrv_fsmo_role_check(struct dreplsrv_service *service,
                        talloc_free(tmp_ctx);
                        return WERR_DS_DRA_INTERNAL_ERROR;
                }
+               extended_op = DRSUAPI_EXOP_FSMO_REQ_ROLE;
                break;
        case DREPL_INFRASTRUCTURE_MASTER:
                fsmo_role_dn = samdb_infrastructure_dn(ldb, tmp_ctx);

diff --git a/source4/torture/drs/python/fsmo.py b/source4/torture/drs/python/fsmo.py
index c64a0b2987f27da40c5bd18dc9e429cdfb2c5398..9b13275e18a3ffe4d85b972392a95d30838a836a 100644 (file)
--- a/source4/torture/drs/python/fsmo.py
+++ b/source4/torture/drs/python/fsmo.py
@@ -148,6 +148,10 @@ class DrsFsmoTestCase(samba.tests.TestCase):
         self._role_transfer(role="rid", role_dn=self.rid_dn)
         pass
 
+    def test_NamingMasterTransfer(self):
+        self._role_transfer(role="naming", role_dn=self.naming_dn)
+        pass
+
 
 ########################################################################################
 def get_env_var(var_name):