summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Atanasov <anatoliy.atanasov@postpath.com>2010-09-19 10:48:31 -0700
committerAnatoliy Atanasov <anatoliy.atanasov@postpath.com>2010-09-19 12:16:04 -0700
commit5d807107bb675cedb4b42022a7a907ea1bdf13d0 (patch)
tree9dbfad0bbbf4dbd2bf617722b2e28ca9bab749d7
parent55f465576c4602e74a6bc5c194adb27231c520f8 (diff)
downloadsamba-5d807107bb675cedb4b42022a7a907ea1bdf13d0.tar.gz
samba-5d807107bb675cedb4b42022a7a907ea1bdf13d0.tar.bz2
samba-5d807107bb675cedb4b42022a7a907ea1bdf13d0.zip
s4/fsmo: Naming master support added
Test suite for fsmo is extended with a test case for naming master too.
-rw-r--r--source4/dsdb/repl/drepl_fsmo.c3
-rw-r--r--source4/torture/drs/python/fsmo.py4
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/dsdb/repl/drepl_fsmo.c b/source4/dsdb/repl/drepl_fsmo.c
index 375e37b517..650b299c1d 100644
--- 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 c64a0b2987..9b13275e18 100644
--- 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):