diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-16 13:06:44 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-16 08:18:10 +0200 |
| commit | d9f7195a1f5a12d5dc8865aa5553b61a4f770e3d (patch) | |
| tree | 2ab5ec9cf03d2d31eb05219434cd30a893b8d5d2 /source4/setup | |
| parent | 39766b75a40fbab73fc23dd947de44f8349ed466 (diff) | |
| download | samba-d9f7195a1f5a12d5dc8865aa5553b61a4f770e3d.tar.gz samba-d9f7195a1f5a12d5dc8865aa5553b61a4f770e3d.tar.bz2 samba-d9f7195a1f5a12d5dc8865aa5553b61a4f770e3d.zip | |
s4-classicupgrade: Use "samba classic" description for samba3 NT4-like domains in samba3upgrade
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/tests/blackbox_s3upgrade.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh index d968129ea1..1f5cd11c35 100755 --- a/source4/setup/tests/blackbox_s3upgrade.sh +++ b/source4/setup/tests/blackbox_s3upgrade.sh @@ -39,7 +39,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF debug level = 0 EOF -testit "samba3-upgrade-member" $samba_tool domain samba3upgrade $PREFIX/samba3-upgrade/samba3/smb1.conf --targetdir=$PREFIX/samba3-upgrade/s4_1 --dbdir=$PREFIX/samba3-upgrade/samba3 +testit "samba3-upgrade-member" $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb1.conf --targetdir=$PREFIX/samba3-upgrade/s4_1 --dbdir=$PREFIX/samba3-upgrade/samba3 testit "samba3-upgrade-member-getlocalsid" $samba_net getlocalsid s3upgrade -s $PREFIX/samba3-upgrade/s4_1/etc/smb.conf # Test 2 (s3 dc) @@ -63,7 +63,8 @@ EOF mv $PREFIX/samba3-upgrade/samba3/wins.dat2 $PREFIX/samba3-upgrade/samba3/wins.dat -testit "samba3-upgrade-dc" $samba_tool domain samba3upgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_2 --dbdir=$PREFIX/samba3-upgrade/samba3 +testit "samba3-upgrade-dc" $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_2 --dbdir=$PREFIX/samba3-upgrade/samba3 + NT4-like domains in samba3upgrade testit "samba3-upgrade-dc-getlocalsid" $samba_net getlocalsid samba -s $PREFIX/samba3-upgrade/s4_2/etc/smb.conf testit "samba3-upgrade-dc-getdomainsid" $samba_net getdomainsid -s $PREFIX/samba3-upgrade/s4_2/etc/smb.conf @@ -89,7 +90,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF domain logons = yes EOF -testit "samba3-upgrade-testparm" $samba_tool domain samba3upgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_3 --testparm=$testparm +testit "samba3-upgrade-testparm" $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_3 --testparm=$testparm testit "samba3-upgrade-testparm-getlocalsid" $samba_net getlocalsid samba -s $PREFIX/samba3-upgrade/s4_3/etc/smb.conf testit "samba3-upgrade-testparm-getdomainsid" $samba_net getdomainsid -s $PREFIX/samba3-upgrade/s4_3/etc/smb.conf |