From 85dae675a56ea253b79d16297cc287fae62606af Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Mon, 5 Jun 2017 22:48:38 +0200 Subject: [PATCH] auth: fix override in ldap backend --- modules/ldapbackend/ldapbackend.cc | 4 ++-- modules/ldapbackend/ldapbackend.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc index 6c8d8adc84..a85eb257d0 100644 --- a/modules/ldapbackend/ldapbackend.cc +++ b/modules/ldapbackend/ldapbackend.cc @@ -582,7 +582,7 @@ void LdapBackend::getUpdatedMasters( vector* domains ) continue; DomainInfo di; - if ( !getDomainInfo( result["associatedDomain"][0], di ) ) + if ( !getDomainInfo( DNSName( result["associatedDomain"][0] ), di ) ) continue; di.backend = this; @@ -695,7 +695,7 @@ bool LdapBackend::getDomainInfo( const DNSName& domain, DomainInfo& di ) try { // search for SOARecord of domain - filter = "(&(associatedDomain=" + toLower( m_pldap->escape( domain ) ) + ")(SOARecord=*))"; + filter = "(&(associatedDomain=" + toLower( m_pldap->escape( domain.toStringRootDot() ) ) + ")(SOARecord=*))"; m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, attronly ); m_pldap->getSearchEntry( msgid, result ); } diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh index 8534a50313..ffdefb1bc7 100644 --- a/modules/ldapbackend/ldapbackend.hh +++ b/modules/ldapbackend/ldapbackend.hh @@ -143,7 +143,7 @@ class LdapBackend : public DNSBackend void lookup( const QType& qtype, const DNSName& qdomain, DNSPacket* p = 0, int zoneid = -1 ) override; bool get( DNSResourceRecord& rr ) override; - bool getDomainInfo( const string& domain, DomainInfo& di ); // override; Broken overload + bool getDomainInfo( const DNSName& domain, DomainInfo& di ) override; // Master backend void getUpdatedMasters( vector* domains ) override; -- 2.47.2