diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-03-28 14:17:45 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-03-29 00:00:22 +0200 |
| commit | f4d581468c467135553bba657a40ca1eb6ccc11c (patch) | |
| tree | 3d05df3f7e0eccf0e60dcb094e6c96457ba8e397 | |
| parent | 9eb9b11bfd108095ceb4c1813b4f7feac12f3401 (diff) | |
| download | samba-f4d581468c467135553bba657a40ca1eb6ccc11c.tar.gz samba-f4d581468c467135553bba657a40ca1eb6ccc11c.tar.bz2 samba-f4d581468c467135553bba657a40ca1eb6ccc11c.zip | |
s4-fsmo: samba-tool fsmo takes a URL, not a hostname
better to call the option --url
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/scripting/python/samba/netcmd/fsmo.py | 6 | ||||
| -rw-r--r-- | source4/torture/drs/python/fsmo.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py index 0c8d17c74f..df6bb20ba3 100644 --- a/source4/scripting/python/samba/netcmd/fsmo.py +++ b/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() diff --git a/source4/torture/drs/python/fsmo.py b/source4/torture/drs/python/fsmo.py index c137c7e8e5..f1fa6ef1fd 100644 --- a/source4/torture/drs/python/fsmo.py +++ b/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)) |