From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 15 Oct 2012 09:46:07 +0000 (+0000)
Subject: fix parsing of RP records in bind zones; fix writing out of SRV records in bind zones... 
X-Git-Tag: auth-3.2-rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6348d4068d10b4ce7779fc700f56d08d4053a099;p=thirdparty%2Fpdns.git

fix parsing of RP records in bind zones; fix writing out of SRV records in bind zones; update tests for these changes

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2812 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 2b0ee4ae5a..adafd5792e 100644
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -250,7 +250,11 @@ bool Bind2Backend::feedRecord(const DNSResourceRecord &r)
   case QType::MX:
     if(!stripDomainSuffix(&content, domain))
       content+=".";
+    *d_of<<qname<<"\t"<<r.ttl<<"\t"<<r.qtype.getName()<<"\t"<<r.priority<<"\t"<<content<<endl;
+    break;
   case QType::SRV:
+    if(!stripDomainSuffix(&content, domain))
+      content+=".";
     *d_of<<qname<<"\t"<<r.ttl<<"\t"<<r.qtype.getName()<<"\t"<<r.priority<<"\t"<<content<<endl;
     break;
   case QType::CNAME:
diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index e4c9463c4c..f14f60be1f 100644
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -376,6 +376,15 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr)
     }
     break;
   
+  case QType::RP:
+    stringtok(recparts, rr.content);
+    if(recparts.size()==2) {
+      recparts[0] = stripDot(toCanonic(d_zonename, recparts[0]));
+      recparts[1] = stripDot(toCanonic(d_zonename, recparts[1]));
+      rr.content=recparts[0]+" "+recparts[1];
+    }
+    break;
+
   case QType::SRV:
     stringtok(recparts, rr.content);
     if(recparts.size()==4) {
diff --git a/regression-tests/test.com b/regression-tests/test.com
index 63e3ef6afb..e0f0180274 100644
--- a/regression-tests/test.com
+++ b/regression-tests/test.com
@@ -13,13 +13,13 @@ $ORIGIN test.com.
 @			IN	MX	15	smtp-servers
 www			IN	CNAME	server1
 server1			IN	A	1.2.3.4
-			IN	RP	ahu.ds9a.nl counter.test.com.
+			IN	RP	ahu.ds9a.nl. counter
 *.test			IN	CNAME	server1
 www.test		IN	A	4.3.2.1
 sub.test		IN	NS	ns-test.example.net
 enum			IN	NAPTR 100 50 "u" "e2u+sip" "" testuser@domain.com.
 counter			IN	A	1.1.1.5
-_ldap._tcp.dc		IN	SRV 	0 100 389 server1
+_ldap._tcp.dc		IN	SRV 	0 100 389 server2.example.net.
 _double._tcp.dc		IN	SRV 	0 100 389 server1
 _double._tcp.dc		IN	SRV 	1 100 389 server1
 blah			IN	NS	blah