diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-16 13:58:06 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-16 08:18:10 +0200 |
| commit | 61f7f0155465b14612f7ac29a12c442ff25031b4 (patch) | |
| tree | 39c8c81e6da3d803dd760e8a6fc10f07ad474ecd | |
| parent | d0b60f02dd3c324d4c990dae7334b228dddba075 (diff) | |
| download | samba-61f7f0155465b14612f7ac29a12c442ff25031b4.tar.gz samba-61f7f0155465b14612f7ac29a12c442ff25031b4.tar.bz2 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
| -rw-r--r-- | source4/scripting/python/samba/samba3/__init__.py | 3 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_s3upgrade.sh | 2 | ||||
| -rw-r--r-- | testdata/samba3/wins.dat2 | 23 |
3 files changed, 27 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/samba3/__init__.py b/source4/scripting/python/samba/samba3/__init__.py index a955be1a73..14db90ac51 100644 --- 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 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 diff --git a/testdata/samba3/wins.dat2 b/testdata/samba3/wins.dat2 new file mode 100644 index 0000000000..f2c2a3b7d0 --- /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 |