sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source 
The issue was that the numbers at the end of the lines are space
padded.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-06-16 13:58:06 +10:00
parent d0b60f02dd
commit 61f7f01554
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/scripting/python/samba/samba3/__init__.py
View File

@ -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

2
source4/setup/tests/blackbox_s3upgrade.sh
View File

@ -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

23
testdata/samba3/wins.dat2 vendored Normal file
View File

@ -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