summaryrefslogtreecommitdiff
path: root/source4/scripting/bin/samba_upgradedns
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2012-02-28 18:27:04 +1100
committerAmitay Isaacs <amitay@gmail.com>2012-03-02 00:24:50 +1100
commite5409ad0ca0517118c261fa924221fd18afaf66d (patch)
tree97dc3ec52271584989f989f47acef7d5c09657d6 /source4/scripting/bin/samba_upgradedns
parentcf139b4efcf13c12b20f63969c0744771a0d8e9a (diff)
downloadsamba-e5409ad0ca0517118c261fa924221fd18afaf66d.tar.gz
samba-e5409ad0ca0517118c261fa924221fd18afaf66d.tar.bz2
samba-e5409ad0ca0517118c261fa924221fd18afaf66d.zip
upgradedns: Fix import of TXT DNS records
Diffstat (limited to 'source4/scripting/bin/samba_upgradedns')
-rwxr-xr-xsource4/scripting/bin/samba_upgradedns4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index 234bfe84a3..11472388d2 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -24,6 +24,7 @@ import optparse
import logging
import grp
from base64 import b64encode
+import shlex
sys.path.insert(0, 'bin/python')
@@ -112,7 +113,8 @@ def convert_dns_rdata(rdata, serial=1):
priority=int(rdata.priority), weight=int(rdata.weight),
serial=serial)
elif rdata.rdtype == dns.rdatatype.TXT:
- rec = TXTRecord(rdata.to_text(relativize=False), serial=serial)
+ slist = shlex.split(rdata.to_text())
+ rec = TXTRecord(slist, serial=serial)
elif rdata.rdtype == dns.rdatatype.SOA:
rec = SOARecord(rdata.mname.to_text(), rdata.rname.to_text(),
serial=int(rdata.serial),