auth: fix override in ldap backend

diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc
index 6c8d8adc8474ae4c9c2aff199b8da3ddf24b130e..a85eb257d079337bfa8a37538c341ac9d8b12b65 100644 (file)
--- a/modules/ldapbackend/ldapbackend.cc
+++ b/modules/ldapbackend/ldapbackend.cc
@@ -582,7 +582,7 @@ void LdapBackend::getUpdatedMasters( vector<DomainInfo>* 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 8534a503132229104cff9d6549314f01a121bf37..ffdefb1bc7d23315e2a7cf29beca7eee63ffea71 100644 (file)
--- 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<DomainInfo>* domains ) override;