From: Grégory Oestreicher <greg@kamago.net>
Date: Sat, 14 Oct 2017 21:52:35 +0000 (+0200)
Subject: Add support for ALIAS record
X-Git-Tag: dnsdist-1.3.1~167^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5821%2Fhead;p=thirdparty%2Fpdns.git

Add support for ALIAS record
---

diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh
index 6ae55d9f09..37828337f6 100644
--- a/modules/ldapbackend/ldapbackend.hh
+++ b/modules/ldapbackend/ldapbackend.hh
@@ -56,6 +56,7 @@ class LdapAuthenticator;
 static const char* ldap_attrany[] = {
   "associatedDomain",
   "dNSTTL",
+  "ALIASRecord",
   "aRecord",
   "nSRecord",
   "cNAMERecord",
diff --git a/modules/ldapbackend/pdns-domaininfo.schema b/modules/ldapbackend/pdns-domaininfo.schema
index 4d300e9144..c4cf100a2b 100644
--- a/modules/ldapbackend/pdns-domaininfo.schema
+++ b/modules/ldapbackend/pdns-domaininfo.schema
@@ -58,6 +58,12 @@ attributetype ( 1.3.6.1.4.1.27080.1.13 NAME 'PdnsRecordOrdername'
     EQUALITY caseIgnoreMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
+attributetype (  1.3.6.1.4.1.27080.1.15 NAME 'ALIASRecord'
+    DESC 'PowerDNS ALIAS RR type'
+    EQUALITY caseIgnoreIA5Match
+    SUBSTR caseIgnoreIA5SubstringsMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
 objectclass ( 1.3.6.1.4.1.27080.2.2.1 NAME 'PdnsDomain'
     DESC 'PDNS domain metadata information'
     SUP top AUXILIARY
@@ -68,4 +74,4 @@ objectclass ( 1.3.6.1.4.1.27080.2.2.1 NAME 'PdnsDomain'
 objectclass ( 1.3.6.1.4.1.27080.2.2.4 NAME 'PdnsRecordData'
     DESC 'Additional record data for PDNS'
     SUP top AUXILIARY
-    MAY ( PdnsRecordTTL $ PdnsRecordNoAuth $ PdnsRecordOrdername ) )
+    MAY ( PdnsRecordTTL $ PdnsRecordNoAuth $ PdnsRecordOrdername $ ALIASRecord ) )
diff --git a/regression-tests/backends/ldap-master b/regression-tests/backends/ldap-master
index 25138b9b21..d347d11cf6 100644
--- a/regression-tests/backends/ldap-master
+++ b/regression-tests/backends/ldap-master
@@ -26,10 +26,12 @@ __EOF__
 
 		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
 			--config-name=ldap --socket-dir=./ --no-shuffle \
-			--query-logging \
+			--query-logging --dnsupdate=yes \
+      --expand-alias=yes --outgoing-axfr-expand-alias=yes \
+      --resolver=8.8.8.8 \
 			--cache-ttl=$cachettl --dname-processing $lua_prequery &
 
-		skipreasons="nodnssec noent nodyndns nometa noaxfr noalias"
+		skipreasons="nodnssec noent nodyndns nometa noaxfr"
 
 		;;
 	*)