auth: skip mailbox tests with mydns,tinydns and ldap backends

diff --git a/docs/upgrading.rst b/docs/upgrading.rst
index fe332108dfbde299b8eea4ca1dd43bee4c484836..a9ae0de6cf789079baae3de53d423e5799f7a884 100644 (file)
--- a/docs/upgrading.rst
+++ b/docs/upgrading.rst
@@ -8,17 +8,6 @@ Please upgrade to the PowerDNS Authoritative Server 4.0.0 from 3.4.2+.
 See the `3.X <https://doc.powerdns.com/3/authoritative/upgrading/>`__
 upgrade notes if your version is older than 3.4.2.
 
-4.1.X to 4.2.0
---------------
-
-- *Your LDAP schema might need to be updated*, because new record types
-  have been added (see below).
-- The :doc:`LDAP Backend <backends/ldap>` now supports additional Record types
-
-  - MB
-  - MG
-  - MR
-
 4.1.0 to 4.1.1
 --------------
 

diff --git a/modules/ldapbackend/dnsdomain2.schema b/modules/ldapbackend/dnsdomain2.schema
index 2a2812ea3fa39acf612e5aff37b71b41a0a13fb5..2c88c341bb8ad8b273f1c570014670fdf57daaf6 100644 (file)
--- a/modules/ldapbackend/dnsdomain2.schema
+++ b/modules/ldapbackend/dnsdomain2.schema
@@ -14,24 +14,6 @@ attributetype ( 1.3.6.1.4.1.2428.20.0.1 NAME 'dNSClass'
        EQUALITY caseIgnoreIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-attributetype ( 1.3.6.1.4.1.2428.20.1.7 NAME 'mBRecord'
-       DESC 'Location of a given domain e-mail address, RFC 1035'
-       EQUALITY caseIgnoreIA5Match
-       SUBSTR caseIgnoreIA5SubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.8 NAME 'mGRecord'
-       DESC 'Defines mailbox names that are part of a mail group, RFC 1035'
-       EQUALITY caseIgnoreIA5Match
-       SUBSTR caseIgnoreIA5SubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.9 NAME 'mRRecord'
-       DESC 'Defines aliased mailbox, RFC 1035'
-       EQUALITY caseIgnoreIA5Match
-       SUBSTR caseIgnoreIA5SubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
 attributetype ( 1.3.6.1.4.1.2428.20.1.11 NAME 'wKSRecord'
        DESC 'a well known service description, RFC 1035'
        EQUALITY caseIgnoreIA5Match
@@ -297,5 +279,5 @@ objectclass ( 1.3.6.1.4.1.2428.20.2 NAME 'dNSDomain2'
                TLSARecord $ CDSRecord $ CDNSKEYRecord $ OPENPGPKEYRecord $
                SPFRecord $ EUI48Record $ EUI64Record $ TKEYRecord $
                URIRecord $ CAARecord $ DLVRecord $ TYPE65226Record $
-               TYPE65534Record $ MBRecord $ MGRecord $ MRRecord
+               TYPE65534Record
        ) )

diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh
index 0eed3b8d0db4350e294d8acefc52c5e518d208bb..d836ce8a9c13cea02b38a83309dd8bf10e7b433d 100644 (file)
--- a/modules/ldapbackend/ldapbackend.hh
+++ b/modules/ldapbackend/ldapbackend.hh
@@ -59,10 +59,6 @@ static const char* ldap_attrany[] = {
   "nSRecord",
   "cNAMERecord",
   "sOARecord",
-  "mBRecord",
-  "mGRecord",
-  "mRRecord",
-  "mInfoRecord",
   "pTRRecord",
   "hInfoRecord",
   "mXRecord",

diff --git a/regression-tests/tests/basic-mb-resolution/skip.ldap-simple b/regression-tests/tests/basic-mb-resolution/skip.ldap-simple
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mb-resolution/skip.ldap-strict b/regression-tests/tests/basic-mb-resolution/skip.ldap-strict
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mb-resolution/skip.ldap-tree b/regression-tests/tests/basic-mb-resolution/skip.ldap-tree
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mb-resolution/skip.mydns b/regression-tests/tests/basic-mb-resolution/skip.mydns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mb-resolution/skip.tinydns b/regression-tests/tests/basic-mb-resolution/skip.tinydns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mg-resolution/skip.ldap-simple b/regression-tests/tests/basic-mg-resolution/skip.ldap-simple
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mg-resolution/skip.ldap-strict b/regression-tests/tests/basic-mg-resolution/skip.ldap-strict
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mg-resolution/skip.ldap-tree b/regression-tests/tests/basic-mg-resolution/skip.ldap-tree
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mg-resolution/skip.mydns b/regression-tests/tests/basic-mg-resolution/skip.mydns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mg-resolution/skip.tinydns b/regression-tests/tests/basic-mg-resolution/skip.tinydns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mr-resolution/skip.ldap-simple b/regression-tests/tests/basic-mr-resolution/skip.ldap-simple
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mr-resolution/skip.ldap-strict b/regression-tests/tests/basic-mr-resolution/skip.ldap-strict
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mr-resolution/skip.ldap-tree b/regression-tests/tests/basic-mr-resolution/skip.ldap-tree
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mr-resolution/skip.mydns b/regression-tests/tests/basic-mr-resolution/skip.mydns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/tests/basic-mr-resolution/skip.tinydns b/regression-tests/tests/basic-mr-resolution/skip.tinydns
new file mode 100644 (file)
index 0000000..e69de29