sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-22 02:50:28 +03:00
Code

s4-fsmo: samba-tool fsmo takes a URL, not a hostname

Browse Source 
better to call the option --url

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell 2011-03-28 14:17:45 +11:00 committed by Andrew Bartlett
parent 9eb9b11bfd
commit f4d581468c
2 changed files with 5 additions and 5 deletions
source4
scripting/python/samba/netcmd
fsmo.py
torture/drs/python
fsmo.py

6
source4/scripting/python/samba/netcmd/fsmo.py

@ -43,7 +43,7 @@ class cmd_fsmo(Command):
}
takes_options = [
Option("--host", help="LDB URL for database or target server", type=str),
Option("--url", 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
@ -130,12 +130,12 @@ all=all of the above"""),
"fSMORoleOwner")
samdb.modify(m)
def run(self, subcommand, force=None, host=None, role=None,
def run(self, subcommand, force=None, url=None, role=None,
credopts=None, sambaopts=None, versionopts=None):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
samdb = SamDB(url=host, session_info=system_session(),
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp)
domain_dn = samdb.domain_dn()

4
source4/torture/drs/python/fsmo.py

@ -61,8 +61,8 @@ class DrsFsmoTestCase(drs_base.DrsBaseTestCase):
creds = self.get_credentials()
cmd_line_auth = "-U%s/%s%%%s" % (creds.get_domain(),
creds.get_username(), creds.get_password())
# bin/samba-tool fsmo transfer --role=role --host=ldap://DC:389
cmd_line = "%s fsmo transfer --role=%s --host=ldap://%s:389 %s" % (net_cmd, role, DC,
# bin/samba-tool fsmo transfer --role=role --url=ldap://DC:389
cmd_line = "%s fsmo transfer --role=%s --url=ldap://%s:389 %s" % (net_cmd, role, DC,
cmd_line_auth)
ret = os.system(cmd_line)
self.assertEquals(ret, 0, "Transferring role %s to %s has failed!" % (role, DC))