From: Mark Schouten <mark@tuxis.nl>
Date: Thu, 24 Jul 2014 20:18:39 +0000 (+0200)
Subject: 'Compensate' for legacy stuff in parsing the priorityfield
X-Git-Tag: auth-3.4.0-rc1~25^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28d96d3f04fd9db9601dfbb8416aa266f823bf73;p=thirdparty%2Fpdns.git

'Compensate' for legacy stuff in parsing the priorityfield
---

diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 8b8226efcd..68a2333cbb 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -569,6 +569,20 @@ static void gatherRecordsFromZone(const Value &container, vector<DNSResourceReco
       if(rr.qtype.getCode() == QType::SOA)
         seenSOA=true;
 
+      rr.priority = 0;
+
+      if (rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::SRV) {
+        int prio;
+        prio=atoi(rr.content.c_str());
+
+        string::size_type pos = rr.content.find_first_not_of("0123456789");
+        if(pos != string::npos)
+          boost::erase_head(rr.content, pos);
+        trim_left(rr.content);
+        rr.priority = prio;
+      }
+
+
       rr.qname = stripDot(rr.qname);
       new_records.push_back(rr);
     }
diff --git a/regression-tests.api/test_Zones.py b/regression-tests.api/test_Zones.py
index 8ab8fa4c89..dda5f222c2 100644
--- a/regression-tests.api/test_Zones.py
+++ b/regression-tests.api/test_Zones.py
@@ -272,7 +272,7 @@ powerdns.com.           86400   IN      SOA     powerdnssec1.ds9a.nl. ahu.ds9a.n
         expected['SOA'] = []
         expected['SOA'].append('powerdnssec1.ds9a.nl. ahu.ds9a.nl. 1343746984 10800 3600 604800 10800')
         expected['MX'] = []
-        expected['MX'].append('0 xs.powerdns.com.')
+        expected['MX'].append('xs.powerdns.com.')
         expected['A'] = []
         expected['A'].append('82.94.213.34')
         expected['AAAA'] = []
@@ -330,7 +330,7 @@ fred   IN  A      192.168.0.4
         expected['SOA'] = []
         expected['SOA'].append('ns1.example.org. hostmaster.example.org. 2002022401 10800 15 604800 10800')
         expected['MX'] = []
-        expected['MX'].append('10 mail.another.com.')
+        expected['MX'].append('mail.another.com.')
         expected['A'] = []
         expected['A'].append('192.168.0.1')
         expected['A'].append('192.168.0.2')