summaryrefslogtreecommitdiffstats
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-16 13:58:06 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-16 08:18:10 +0200
commit61f7f0155465b14612f7ac29a12c442ff25031b4 (patch)
tree39c8c81e6da3d803dd760e8a6fc10f07ad474ecd /source4/setup
parentd0b60f02dd3c324d4c990dae7334b228dddba075 (diff)
downloadsamba-61f7f0155465b14612f7ac29a12c442ff25031b4.tar.gz
samba-61f7f0155465b14612f7ac29a12c442ff25031b4.tar.xz
samba-61f7f0155465b14612f7ac29a12c442ff25031b4.zip
s4-s3upgrade: Add my wins.dat and fix the parsing error
The issue was that the numbers at the end of the lines are space padded. Andrew Bartlett
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/tests/blackbox_s3upgrade.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh
index d8f5d8fced..d968129ea1 100755
--- a/source4/setup/tests/blackbox_s3upgrade.sh
+++ b/source4/setup/tests/blackbox_s3upgrade.sh
@@ -61,6 +61,8 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
domain logons = yes
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-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