From bd073c3688ca4687c25347ca46a40ba1d1dfcb54 Mon Sep 17 00:00:00 2001 From: bert hubert Date: Thu, 8 Sep 2016 05:40:23 +0200 Subject: [PATCH] restore old ldap logging behaviour --- modules/ldapbackend/ldapbackend.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc index 6cf1ce392..3ed7574f0 100644 --- a/modules/ldapbackend/ldapbackend.cc +++ b/modules/ldapbackend/ldapbackend.cc @@ -26,8 +26,7 @@ #include "ldapbackend.hh" unsigned int ldap_host_index = 0; -#undef DLOG -#define DLOG(x) x + LdapBackend::LdapBackend( const string &suffix ) { string hoststr; @@ -168,7 +167,7 @@ inline bool LdapBackend::list_simple( const DNSName& target, int domain_id ) prepare(); filter = strbind( ":target:", "associatedDomain=*." + qesc, getArg( "filter-axfr" ) ); - DLOG( L << Logger::Warning << m_myname << " Search = basedn: " << dn << ", filter: " << filter << endl ); + DLOG( L << Logger::Debug << m_myname << " Search = basedn: " << dn << ", filter: " << filter << endl ); m_msgid = m_pldap->search( dn, LDAP_SCOPE_SUBTREE, filter, (const char**) ldap_attrany ); return true; @@ -239,7 +238,7 @@ void LdapBackend::lookup_simple( const QType &qtype, const DNSName &qname, DNSPa filter = strbind( ":target:", filter, getArg( "filter-lookup" ) ); - DLOG( L << Logger::Warning << m_myname << " Search = basedn: " << getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); + DLOG( L << Logger::Debug << m_myname << " Search = basedn: " << getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, attributes ); } @@ -284,7 +283,7 @@ void LdapBackend::lookup_strict( const QType &qtype, const DNSName &qname, DNSPa filter = strbind( ":target:", filter, getArg( "filter-lookup" ) ); - DLOG( L << Logger::Warning << m_myname << " Search = basedn: " << getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); + DLOG( L << Logger::Debug << m_myname << " Search = basedn: " << getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, attributes ); } @@ -317,7 +316,7 @@ void LdapBackend::lookup_tree( const QType &qtype, const DNSName &qname, DNSPack dn = "dc=" + *i + "," + dn; } - DLOG( L << Logger::Warning << m_myname << " Search = basedn: " << dn + getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); + DLOG( L << Logger::Debug << m_myname << " Search = basedn: " << dn + getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); m_msgid = m_pldap->search( dn + getArg( "basedn" ), LDAP_SCOPE_BASE, filter, attributes ); } @@ -446,7 +445,7 @@ bool LdapBackend::get( DNSResourceRecord &rr ) rr.content = *m_value; m_value++; - DLOG( L << Logger::Warning << m_myname << " Record = qname: " << rr.qname << ", qtype: " << (rr.qtype).getName() << ", ttl: " << rr.ttl << ", content: " << rr.content << endl ); + DLOG( L << Logger::Debug << m_myname << " Record = qname: " << rr.qname << ", qtype: " << (rr.qtype).getName() << ", ttl: " << rr.ttl << ", content: " << rr.content << endl ); return true; } -- 2.49.0