[SCM] Samba Shared Repository - branch master updated

Anatoliy Atanasov anatoliy at samba.org
Sun Sep 19 13:17:18 MDT 2010


The branch, master has been updated
       via  5d80710 s4/fsmo: Naming master support added
      from  55f4655 s4-smbtorture: add LOCAL-NDR-NTLMSSP.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5d807107bb675cedb4b42022a7a907ea1bdf13d0
Author: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
Date:   Sun Sep 19 10:48:31 2010 -0700

    s4/fsmo: Naming master support added
    
    Test suite for fsmo is extended with a test case for naming master too.

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/repl/drepl_fsmo.c     |    3 ++-
 source4/torture/drs/python/fsmo.py |    4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/repl/drepl_fsmo.c b/source4/dsdb/repl/drepl_fsmo.c
index 375e37b..650b299 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 c64a0b2..9b13275 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):


-- 
Samba Shared Repository


More information about the samba-cvs mailing list