restore old ldap logging behaviour

diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc
index 6cf1ce392ac364577f35572b11cb5fd3f78f544d..3ed7574f01fd96a5d30b4fb993867e4086bf0350 100644 (file)
--- 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;
                                        }