summaryrefslogtreecommitdiff
path: root/wintest
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-07-19 12:54:37 +1000
committerAndrew Tridgell <tridge@samba.org>2011-07-21 11:44:38 +1000
commite593939da1412bc8596027b05896c460bed244f8 (patch)
tree3cdcf0d497b83b44c647eaa3e56976fd7f8c461a /wintest
parent2cfe528ab684c74e65e6f2617390fcd33e6baac4 (diff)
downloadsamba-e593939da1412bc8596027b05896c460bed244f8.tar.gz
samba-e593939da1412bc8596027b05896c460bed244f8.tar.bz2
samba-e593939da1412bc8596027b05896c460bed244f8.zip
samba-tool: fixed some more calls to samba_tool join to be 'domain join'
Diffstat (limited to 'wintest')
-rwxr-xr-xwintest/test-s4-howto.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 6f8bc7446c..abd6eebccd 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -385,7 +385,7 @@ def test_dcpromo_rodc(t, vm):
def prep_join_as_dc(t, vm):
'''start VM and shutdown Samba in preperation to join a windows domain as a DC'''
- t.info("Starting VMs for joining ${WIN_VM} as a second DC using samba-tool join DC")
+ t.info("Starting VMs for joining ${WIN_VM} as a second DC using samba-tool domain join DC")
t.chdir('${PREFIX}')
t.run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
t.rndc_cmd('flush')
@@ -396,12 +396,12 @@ def prep_join_as_dc(t, vm):
def join_as_dc(t, vm):
'''join a windows domain as a DC'''
t.setwinvars(vm)
- t.info("Joining ${WIN_VM} as a second DC using samba-tool join DC")
+ t.info("Joining ${WIN_VM} as a second DC using samba-tool domain join DC")
t.port_wait("${WIN_IP}", 389)
t.retry_cmd("host -t SRV _ldap._tcp.${WIN_REALM} ${WIN_IP}", ['has SRV record'] )
t.retry_cmd("bin/samba-tool drs showrepl ${WIN_HOSTNAME}.${WIN_REALM} -Uadministrator%${WIN_PASS}", ['INBOUND NEIGHBORS'] )
- t.run_cmd('bin/samba-tool join ${WIN_REALM} DC -Uadministrator%${WIN_PASS} -d${DEBUGLEVEL} --option=interfaces=${INTERFACE}')
+ t.run_cmd('bin/samba-tool domain join ${WIN_REALM} DC -Uadministrator%${WIN_PASS} -d${DEBUGLEVEL} --option=interfaces=${INTERFACE}')
t.run_cmd('bin/samba-tool drs kcc ${WIN_HOSTNAME}.${WIN_REALM} -Uadministrator@${WIN_REALM}%${WIN_PASS}')
@@ -470,11 +470,11 @@ def test_join_as_dc(t, vm):
def join_as_rodc(t, vm):
'''join a windows domain as a RODC'''
t.setwinvars(vm)
- t.info("Joining ${WIN_VM} as a RODC using samba-tool join DC")
+ t.info("Joining ${WIN_VM} as a RODC using samba-tool domain join DC")
t.port_wait("${WIN_IP}", 389)
t.retry_cmd("host -t SRV _ldap._tcp.${WIN_REALM} ${WIN_IP}", ['has SRV record'] )
t.retry_cmd("bin/samba-tool drs showrepl ${WIN_HOSTNAME}.${WIN_REALM} -Uadministrator%${WIN_PASS}", ['INBOUND NEIGHBORS'] )
- t.run_cmd('bin/samba-tool join ${WIN_REALM} RODC -Uadministrator%${WIN_PASS} -d${DEBUGLEVEL} --option=interfaces=${INTERFACE}')
+ t.run_cmd('bin/samba-tool domain join ${WIN_REALM} RODC -Uadministrator%${WIN_PASS} -d${DEBUGLEVEL} --option=interfaces=${INTERFACE}')
t.run_cmd('bin/samba-tool drs kcc ${WIN_HOSTNAME}.${WIN_REALM} -Uadministrator@${WIN_REALM}%${WIN_PASS}')