diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-05 18:57:36 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-06 14:36:26 +1100 |
| commit | a162b1a2d865c90441789640104adcd982e2bb75 (patch) | |
| tree | d986fb65c8489127decab444c06d344d348f6310 | |
| parent | 724599de635608f13e0f2d500a59b8830ceede84 (diff) | |
| download | samba-a162b1a2d865c90441789640104adcd982e2bb75.tar.gz samba-a162b1a2d865c90441789640104adcd982e2bb75.tar.bz2 samba-a162b1a2d865c90441789640104adcd982e2bb75.zip | |
s4-join: switch over to the new DC join in make test
| -rw-r--r-- | selftest/target/Samba4.pm | 2 | ||||
| -rwxr-xr-x | source4/scripting/devel/drs/vampire_ad.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 4676ad877c..56b618629b 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -995,7 +995,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 vampire $ret->{CONFIGURATION} $dcvars->{REALM} --realm=$dcvars->{REALM}"; + $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; unless (system($cmd) == 0) { diff --git a/source4/scripting/devel/drs/vampire_ad.sh b/source4/scripting/devel/drs/vampire_ad.sh index ec14b249f5..5740ae1e4b 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 vampire $DNSDOMAIN -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 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 |