upgradedns: Fix import of TXT DNS records

diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index 234bfe84a37f703229be34241e5f790955f4ae80..11472388d23d6f1c56cf8c30f44a13360617a479 100755 (executable)
--- 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),