s4-s3upgrade: Add my wins.dat and fix the parsing error

[samba.git] / source4 / setup / tests / blackbox_s3upgrade.sh

diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh
index f93b43f6b91c0ac66e9ed6cb868dc6e787a86d81..d968129ea1e34dd9ad8334d39958298650979ec1 100755 (executable)
--- a/source4/setup/tests/blackbox_s3upgrade.sh
+++ b/source4/setup/tests/blackbox_s3upgrade.sh
@@ -11,8 +11,9 @@ PREFIX=`pwd`"/$1"
 shift 1
 
 samba4bindir="$BINDIR"
-samba_tool="$samba4bindir/samba-tool$EXEEXT"
-testparm="$samba4bindir/testparm$EXEEXT"
+samba_tool="$samba4bindir/samba-tool"
+samba_net="$samba4bindir/net"
+testparm="$samba4bindir/testparm"
 
 . `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
@@ -39,6 +40,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
 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-getlocalsid" $samba_net getlocalsid s3upgrade -s $PREFIX/samba3-upgrade/s4_1/etc/smb.conf
 
 # Test 2 (s3 dc)
 cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
@@ -59,7 +61,11 @@ 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
 
 #Run final test without a wins.dat
 rm -f $PREFIX/samba3-upgrade/samba3/wins.dat
@@ -84,6 +90,8 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF
 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-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
 
 rm -rf $PREFIX/samba3-upgrade