diff options
| author | Kai Blin <kai@samba.org> | 2010-10-23 19:27:26 -0700 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2010-10-28 07:25:16 +0000 |
| commit | b73a05e4e184238614d73c1519f2880cd946908d (patch) | |
| tree | 5405be11f54e857eeb9b74ca46121ea0b2aea34e /source4/torture/drs | |
| parent | 5634f55cc8d9eb0cca01f621939cee724271ecb0 (diff) | |
| download | samba-b73a05e4e184238614d73c1519f2880cd946908d.tar.gz samba-b73a05e4e184238614d73c1519f2880cd946908d.tar.bz2 samba-b73a05e4e184238614d73c1519f2880cd946908d.zip | |
s4 net: rename to samba-tool in order to not clash with s3 net
Autobuild-User: Kai Blin <kai@samba.org>
Autobuild-Date: Thu Oct 28 07:25:16 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/torture/drs')
| -rw-r--r-- | source4/torture/drs/python/delete_object.py | 8 | ||||
| -rw-r--r-- | source4/torture/drs/python/fsmo.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py index 0cf648f5a0..2936a5717f 100644 --- a/source4/torture/drs/python/delete_object.py +++ b/source4/torture/drs/python/delete_object.py @@ -77,7 +77,7 @@ class DrsDeleteObjectTestCase(samba.tests.TestCase): self.config_dn = self.info_dc1["configurationNamingContext"][0] self.forest_level = int(self.info_dc1["forestFunctionality"][0]) - # we will need DCs DNS names for 'net drs' command + # we will need DCs DNS names for 'samba-tool drs' command self.dnsname_dc1 = self.info_dc1["dnsHostName"][0] self.dnsname_dc2 = self.info_dc2["dnsHostName"][0] @@ -127,13 +127,13 @@ class DrsDeleteObjectTestCase(samba.tests.TestCase): def _net_drs_replicate(self, DC, fromDC): # find out where is net command - net_cmd = os.path.abspath("./bin/net") + samba_tool_cmd = os.path.abspath("./bin/samba-tool") # make command line credentials string creds = samba.tests.cmdline_credentials cmd_line_auth = "-U%s/%s%%%s" % (creds.get_domain(), creds.get_username(), creds.get_password()) - # bin/net drs replicate <Dest_DC_NAME> <Src_DC_NAME> <Naming Context> - cmd_line = "%s drs replicate %s %s %s %s" % (net_cmd, DC, fromDC, + # bin/samba-tool drs replicate <Dest_DC_NAME> <Src_DC_NAME> <Naming Context> + cmd_line = "%s drs replicate %s %s %s %s" % (samba_tool_cmd, DC, fromDC, self.domain_dn, cmd_line_auth) ret = os.system(cmd_line) self.assertEquals(ret, 0, "Replicating %s from %s has failed!" % (DC, fromDC)) diff --git a/source4/torture/drs/python/fsmo.py b/source4/torture/drs/python/fsmo.py index 251507413d..067ee2accb 100644 --- a/source4/torture/drs/python/fsmo.py +++ b/source4/torture/drs/python/fsmo.py @@ -91,13 +91,13 @@ class DrsFsmoTestCase(samba.tests.TestCase): super(DrsFsmoTestCase, self).tearDown() def _net_fsmo_role_transfer(self, DC, role): - # find out where is net command - net_cmd = os.path.abspath("./bin/net") + # find out where is samba-tool command + net_cmd = os.path.abspath("./bin/samba-tool") # make command line credentials string creds = samba.tests.cmdline_credentials cmd_line_auth = "-U%s/%s%%%s" % (creds.get_domain(), creds.get_username(), creds.get_password()) - # bin/net fsmo transfer --role=role --host=ldap://DC:389 + # 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, cmd_line_auth) ret = os.system(cmd_line) |