[SCM] Samba Shared Repository - branch master updated
Nadezhda Ivanova
nivanova at samba.org
Wed Jan 27 09:10:44 MST 2010
The branch, master has been updated
via dffb5ad... Implemented net fsmo command for transferring fsmo roles
from 0e2d1cf... s4-smbtorture: pick correct last packet while checking backchannel replies in RPC-SPOOLSS-NOTIFY.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit dffb5ad2bf75fc0bcb69dce5cde52c8a1ea9c4f9
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date: Wed Jan 27 17:57:37 2010 +0200
Implemented net fsmo command for transferring fsmo roles
The command allows the user to transfer a fsmo role to the server to which
the connection is established. Roles can be transferred or seized. By default a
transfer is attempted even if seize option is chosen, as it is dangerous to
seize a role if the current owner is still running.
example use:
net fsmo show --host=hostnameoraddress --username=username --password=password
net fsmo transfer --role=role --host=hostnameoraddress --username=username --password=password
net fsmo seize --role=role --host=hostnameoraddress --username=username --password=password [--force]
Tested against Win2008. Does not work for samba 4 yet as we are missing the GetNCChanges extensions.
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/netcmd/__init__.py | 2 +
source4/scripting/python/samba/netcmd/fsmo.py | 202 +++++++++++++++++++++
2 files changed, 204 insertions(+), 0 deletions(-)
create mode 100644 source4/scripting/python/samba/netcmd/fsmo.py
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index d6a130c..09c8cc3 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -145,3 +145,5 @@ from samba.netcmd.newuser import cmd_newuser
commands["newuser"] = cmd_newuser()
from samba.netcmd.ntacl import cmd_acl
commands["acl"] = cmd_acl()
+from samba.netcmd.fsmo import cmd_fsmo
+commands["fsmo"] = cmd_fsmo()
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py
new file mode 100644
index 0000000..6bfc2ef
--- /dev/null
+++ b/source4/scripting/python/samba/netcmd/fsmo.py
@@ -0,0 +1,202 @@
+#!/usr/bin/python
+#
+# Changes a FSMO role owner
+#
+# Copyright Nadezhda Ivanova 2009
+# Copyright Jelmer Vernooij 2009
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import samba.getopt as options
+import ldb
+from ldb import LdbError
+
+from samba.auth import system_session
+from samba.netcmd import (
+ Command,
+ CommandError,
+ Option,
+ )
+from samba.samdb import SamDB
+
+class cmd_fsmo(Command):
+ """Makes the targer DC transfer or seize a fsmo role"""
+
+ synopsis = "(show | transfer <options> | seize <options>)"
+
+ takes_optiongroups = {
+ "sambaopts": options.SambaOptions,
+ "credopts": options.CredentialsOptions,
+ "versionopts": options.VersionOptions,
+ }
+
+ takes_options = [
+ Option("--host", help="LDB URL for database or target server", type=str),
+ Option("--force", help="Force seizing of the role without attempting to transfer first.", action="store_true"),
+ Option("--role", type="choice", choices=["rid", "pdc", "infrastructure","schema","naming","all"],
+ help="""The FSMO role to seize or transfer.\n
+rid=RidAllocationMasterRole\n
+schema=SchemaMasterRole\n
+pdc=PdcEmulationMasterRole\n
+naming=DomainNamingMasterRole\n
+infrastructure=InfrastructureMasterRole\n
+all=all of the above"""),
+ ]
+
+ takes_args = ["subcommand"]
+
+ def transfer_role(self, role, samdb):
+ m = ldb.Message()
+ m.dn = ldb.Dn(samdb, "")
+ if role == "rid":
+ m["becomeRidMaster"]= ldb.MessageElement(
+ "1", ldb.FLAG_MOD_REPLACE,
+ "becomeRidMaster")
+ elif role == "pdc":
+ domain_dn = SamDB.domain_dn(samdb)
+ res = samdb.search(domain_dn,
+ scope=ldb.SCOPE_BASE, attrs=["objectSid"])
+ assert(len(res) == 1)
+ sid = res[0]["objectSid"][0]
+ m["becomePdc"]= ldb.MessageElement(
+ sid, ldb.FLAG_MOD_REPLACE,
+ "becomePdc")
+ elif role == "naming":
+ m["becomeDomainMaster"]= ldb.MessageElement(
+ "1", ldb.FLAG_MOD_REPLACE,
+ "becomeDomainMaster")
+ samdb.modify(m)
+ elif role == "infrastructure":
+ m["becomeInfrastructureMaster"]= ldb.MessageElement(
+ "1", ldb.FLAG_MOD_REPLACE,
+ "becomeInfrastructureMaster")
+ elif role == "schema":
+ m["becomeSchemaMaster"]= ldb.MessageElement(
+ "1", ldb.FLAG_MOD_REPLACE,
+ "becomeSchemaMaster")
+ else:
+ raise CommandError("Invalid FSMO role.")
+ samdb.modify(m)
+
+ def seize_role(self, role, samdb, force):
+ res = samdb.search("",
+ scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
+ assert(len(res) == 1)
+ serviceName = res[0]["dsServiceName"][0]
+ domain_dn = SamDB.domain_dn(samdb)
+ m = ldb.Message()
+ if role == "rid":
+ m.dn = ldb.Dn(samdb, self.rid_dn)
+ elif role == "pdc":
+ m.dn = ldb.Dn(samdb, domain_dn)
+ elif role == "naming":
+ m.dn = ldb.Dn(samdb, self.naming_dn)
+ elif role == "infrastructure":
+ m.dn = ldb.Dn(samdb, self.indrastructure_dn)
+ elif role == "schema":
+ m.dn = ldb.Dn(samdb, self.schema_dn)
+ else:
+ raise CommandError("Invalid FSMO role.")
+ #first try to transfer to avoid problem if the owner is still active
+ if force is None:
+ self.message("Attempting transfer...")
+ try:
+ self.transfer_role(role, samdb)
+ except LdbError, (num, _):
+ #transfer failed, use the big axe...
+ self.message("Transfer unsuccessfull, seizing...")
+ m["fSMORoleOwner"]= ldb.MessageElement(
+ serviceName, ldb.FLAG_MOD_REPLACE,
+ "fSMORoleOwner")
+ samdb.modify(m)
+ else:
+ self.message("Transfer succeeded.")
+ else:
+ self.message("Will not attempt transfer, seizing...")
+ m["fSMORoleOwner"]= ldb.MessageElement(
+ serviceName, ldb.FLAG_MOD_REPLACE,
+ "fSMORoleOwner")
+ samdb.modify(m)
+
+ def run(self, subcommand, force=None, host=None, role=None,
+ credopts=None, sambaopts=None, versionopts=None):
+ lp = sambaopts.get_loadparm()
+ creds = credopts.get_credentials(lp)
+
+ if host is not None:
+ url = host
+ else:
+ url = lp.get("sam database")
+
+ samdb = SamDB(url=url, session_info=system_session(),
+ credentials=creds, lp=lp)
+
+ domain_dn = SamDB.domain_dn(samdb)
+ self.infrastructure_dn = "CN=Infrastructure," + domain_dn
+ self.naming_dn = "CN=Partitions,CN=Configuration," + domain_dn
+ self.schema_dn = "CN=Schema,CN=Configuration," + domain_dn
+ self.rid_dn = "CN=RID Manager$,CN=System," + domain_dn
+
+ res = samdb.search(self.infrastructure_dn,
+ scope=ldb.SCOPE_BASE, attrs=["fSMORoleOwner"])
+ assert(len(res) == 1)
+ self.infrastructureMaster = res[0]["fSMORoleOwner"][0]
+
+ res = samdb.search(domain_dn,
+ scope=ldb.SCOPE_BASE, attrs=["fSMORoleOwner"])
+ assert(len(res) == 1)
+ self.pdcEmulator = res[0]["fSMORoleOwner"][0]
+
+ res = samdb.search(self.naming_dn,
+ scope=ldb.SCOPE_BASE, attrs=["fSMORoleOwner"])
+ assert(len(res) == 1)
+ self.namingMaster = res[0]["fSMORoleOwner"][0]
+
+ res = samdb.search(self.schema_dn,
+ scope=ldb.SCOPE_BASE, attrs=["fSMORoleOwner"])
+ assert(len(res) == 1)
+ self.schemaMaster = res[0]["fSMORoleOwner"][0]
+
+ res = samdb.search(self.rid_dn,
+ scope=ldb.SCOPE_BASE, attrs=["fSMORoleOwner"])
+ assert(len(res) == 1)
+ self.ridMaster = res[0]["fSMORoleOwner"][0]
+
+ if subcommand == "show":
+ self.message("InfrastructureMasterRole owner: " + self.infrastructureMaster)
+ self.message("RidAllocationMasterRole owner: " + self.ridMaster)
+ self.message("PdcEmulationMasterRole owner: " + self.pdcEmulator)
+ self.message("DomainNamingMasterRole owner: " + self.namingMaster)
+ self.message("SchemaMasterRole owner: " + self.schemaMaster)
+ elif subcommand == "transfer":
+ if role == "all":
+ self.transfer_role("rid", samdb)
+ self.transfer_role("pdc", samdb)
+ self.transfer_role("naming", samdb)
+ self.transfer_role("infrastructure", samdb)
+ self.transfer_role("schema", samdb)
+ else:
+ self.transfer_role(role, samdb)
+ elif subcommand == "seize":
+ if role == "all":
+ self.seize_role("rid", samdb, force)
+ self.seize_role("pdc", samdb, force)
+ self.seize_role("naming", samdb, force)
+ self.seize_role("infrastructure", samdb, force)
+ self.zeize_role("schema", samdb, force)
+ else:
+ self.seize_role(role, samdb, force)
+ else:
+ raise CommandError("Wrong argument '%s'!" % subcommand)
--
Samba Shared Repository
More information about the samba-cvs
mailing list