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

diff --git a/source4/scripting/python/samba/samba3/__init__.py b/source4/scripting/python/samba/samba3/__init__.py
index a955be1a735f29c43c39be825f9cc2cdc3d3927e..14db90ac51a085df8ffb7b83edbc902843ab3071 100644 (file)
--- a/source4/scripting/python/samba/samba3/__init__.py
+++ b/source4/scripting/python/samba/samba3/__init__.py
@@ -304,7 +304,8 @@ def shellsplit(text):
         if c == "\"":
             inquotes = not inquotes
         elif c in ("\t", "\n", " ") and not inquotes:
-            ret.append(current)
+            if current != "":
+                ret.append(current)
             current = ""
         else:
             current += c

diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh
index d8f5d8fced823162f5c0b177dc73a6485e8782ec..d968129ea1e34dd9ad8334d39958298650979ec1 100755 (executable)
--- 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

diff --git a/testdata/samba3/wins.dat2 b/testdata/samba3/wins.dat2
new file mode 100644 (file)
index 0000000..f2c2a3b
--- /dev/null
+++ b/testdata/samba3/wins.dat2
@@ -0,0 +1,23 @@
+VERSION 1 0
+"FILESERVER#03" 1340075987 192.168.1.99 64R
+"BARTLETT#1b" 1340075987 192.168.1.99 64R
+"YOWIEE#03" 1340075987 192.168.1.99 66R
+"LOGINSERVER#20" 1340075987 192.168.1.99 64R
+"GAMESSERVER#00" 1340075987 192.168.1.99 64R
+"BARTLETT#00" 1340075987 255.255.255.255 e4R
+"FILESERVER#20" 1340075987 192.168.1.99 64R
+"YOWIEE#20" 1340075987 192.168.1.99 66R
+"BARTLETT#1c" 1340075987 192.168.1.99 e4R
+"PRINTSERVER#03" 1340075987 192.168.1.99 64R
+"KYD61BE8#00" 1339924470 0.0.0.0  4R
+"BARTLETT#1e" 1340075987 255.255.255.255 e4R
+"LOGINSERVER#00" 1340075987 192.168.1.99 64R
+"GAMESSERVER#03" 1340075987 192.168.1.99 64R
+"PRINTSERVER#20" 1340075987 192.168.1.99 64R
+"FILESERVER#00" 1340075987 192.168.1.99 64R
+"YOWIEE#00" 1340075987 192.168.1.99 66R
+"KYD61BE8#03" 1339924450 0.0.0.0  4R
+"GAMESSERVER#20" 1340075987 192.168.1.99 64R
+"KYD61BE8#20" 1339924490 0.0.0.0  4R
+"LOGINSERVER#03" 1340075987 192.168.1.99 64R
+"PRINTSERVER#00" 1340075987 192.168.1.99 64R