From cc1b6d35aa32fd05c073cf87e4d80a2469b3dff7 Mon Sep 17 00:00:00 2001 From: Charles-Henri Bruyand Date: Mon, 26 Mar 2018 14:38:50 +0200 Subject: [PATCH] auth: skip mailbox tests with mydns,tinydns and ldap backends --- docs/upgrading.rst | 11 ---------- modules/ldapbackend/dnsdomain2.schema | 20 +------------------ modules/ldapbackend/ldapbackend.hh | 4 ---- .../basic-mb-resolution/skip.ldap-simple | 0 .../basic-mb-resolution/skip.ldap-strict | 0 .../tests/basic-mb-resolution/skip.ldap-tree | 0 .../tests/basic-mb-resolution/skip.mydns | 0 .../tests/basic-mb-resolution/skip.tinydns | 0 .../basic-mg-resolution/skip.ldap-simple | 0 .../basic-mg-resolution/skip.ldap-strict | 0 .../tests/basic-mg-resolution/skip.ldap-tree | 0 .../tests/basic-mg-resolution/skip.mydns | 0 .../tests/basic-mg-resolution/skip.tinydns | 0 .../basic-mr-resolution/skip.ldap-simple | 0 .../basic-mr-resolution/skip.ldap-strict | 0 .../tests/basic-mr-resolution/skip.ldap-tree | 0 .../tests/basic-mr-resolution/skip.mydns | 0 .../tests/basic-mr-resolution/skip.tinydns | 0 18 files changed, 1 insertion(+), 34 deletions(-) create mode 100644 regression-tests/tests/basic-mb-resolution/skip.ldap-simple create mode 100644 regression-tests/tests/basic-mb-resolution/skip.ldap-strict create mode 100644 regression-tests/tests/basic-mb-resolution/skip.ldap-tree create mode 100644 regression-tests/tests/basic-mb-resolution/skip.mydns create mode 100644 regression-tests/tests/basic-mb-resolution/skip.tinydns create mode 100644 regression-tests/tests/basic-mg-resolution/skip.ldap-simple create mode 100644 regression-tests/tests/basic-mg-resolution/skip.ldap-strict create mode 100644 regression-tests/tests/basic-mg-resolution/skip.ldap-tree create mode 100644 regression-tests/tests/basic-mg-resolution/skip.mydns create mode 100644 regression-tests/tests/basic-mg-resolution/skip.tinydns create mode 100644 regression-tests/tests/basic-mr-resolution/skip.ldap-simple create mode 100644 regression-tests/tests/basic-mr-resolution/skip.ldap-strict create mode 100644 regression-tests/tests/basic-mr-resolution/skip.ldap-tree create mode 100644 regression-tests/tests/basic-mr-resolution/skip.mydns create mode 100644 regression-tests/tests/basic-mr-resolution/skip.tinydns diff --git a/docs/upgrading.rst b/docs/upgrading.rst index fe332108d..a9ae0de6c 100644 --- 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 `__ 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 ` 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 2a2812ea3..2c88c341b 100644 --- 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 0eed3b8d0..d836ce8a9 100644 --- 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 index 000000000..e69de29bb 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 index 000000000..e69de29bb 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 index 000000000..e69de29bb diff --git a/regression-tests/tests/basic-mb-resolution/skip.mydns b/regression-tests/tests/basic-mb-resolution/skip.mydns new file mode 100644 index 000000000..e69de29bb diff --git a/regression-tests/tests/basic-mb-resolution/skip.tinydns b/regression-tests/tests/basic-mb-resolution/skip.tinydns new file mode 100644 index 000000000..e69de29bb 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 index 000000000..e69de29bb 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 index 000000000..e69de29bb 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 index 000000000..e69de29bb diff --git a/regression-tests/tests/basic-mg-resolution/skip.mydns b/regression-tests/tests/basic-mg-resolution/skip.mydns new file mode 100644 index 000000000..e69de29bb diff --git a/regression-tests/tests/basic-mg-resolution/skip.tinydns b/regression-tests/tests/basic-mg-resolution/skip.tinydns new file mode 100644 index 000000000..e69de29bb 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 index 000000000..e69de29bb 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 index 000000000..e69de29bb 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 index 000000000..e69de29bb diff --git a/regression-tests/tests/basic-mr-resolution/skip.mydns b/regression-tests/tests/basic-mr-resolution/skip.mydns new file mode 100644 index 000000000..e69de29bb diff --git a/regression-tests/tests/basic-mr-resolution/skip.tinydns b/regression-tests/tests/basic-mr-resolution/skip.tinydns new file mode 100644 index 000000000..e69de29bb -- 2.40.0