diff options
| -rw-r--r-- | selftest/target/Samba4.pm | 8 | ||||
| -rwxr-xr-x | source4/scripting/devel/drs/vampire_ad.sh | 2 | ||||
| -rwxr-xr-x | wintest/test-s4-howto.py | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 2610232c58..47f1bad336 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -860,7 +860,7 @@ sub provision_member($$$) my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} member"; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; unless (system($cmd) == 0) { @@ -928,7 +928,7 @@ sub provision_rpc_proxy($$$) my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} member"; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; unless (system($cmd) == 0) { @@ -1012,7 +1012,7 @@ sub provision_vampire_dc($$$) my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}"; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; unless (system($cmd) == 0) { @@ -1184,7 +1184,7 @@ sub provision_rodc($$$) my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} RODC"; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} RODC"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; $cmd .= " --server=$dcvars->{DC_SERVER}"; diff --git a/source4/scripting/devel/drs/vampire_ad.sh b/source4/scripting/devel/drs/vampire_ad.sh index 5740ae1e4b..031e3c9052 100755 --- a/source4/scripting/devel/drs/vampire_ad.sh +++ b/source4/scripting/devel/drs/vampire_ad.sh @@ -23,6 +23,6 @@ nsupdate -g nsupdate.txt REALM="$(echo $DNSDOMAIN | tr '[a-z]' '[A-Z]')" -sudo $GDB bin/samba-tool join $DNSDOMAIN DC -Uadministrator%$pass -s $PREFIX/etc/smb.conf --option=realm=$REALM --option="ads:dc function level=4" --option="ads:min function level=0" -d2 "$@" || exit 1 +sudo $GDB bin/samba-tool domain join $DNSDOMAIN DC -Uadministrator%$pass -s $PREFIX/etc/smb.conf --option=realm=$REALM --option="ads:dc function level=4" --option="ads:min function level=0" -d2 "$@" || exit 1 # PRIVATEDIR=$PREFIX/private sudo -E scripting/bin/setup_dns.sh $machine $DNSDOMAIN $machine_ip || exit 1 #sudo rndc flush 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}') |