Changeset 180

Timestamp:

08/22/03 15:33:31 (10 years ago)

Author:

ahu

Message:

lots of fixes, axfp ldap support, ldap ttl support, spurious debugging
output removed

Location:

trunk/pdns

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (2 diffs)
• debian/control (modified) (1 diff)
• debian/rules (modified) (1 diff)
• modules/ldapbackend/ldapbackend.cc (modified) (9 diffs)
• modules/ldapbackend/ldapbackend.hh (modified) (3 diffs)
• modules/mysqlbackend/mysqlcbackend.cc (modified) (2 diffs)
• modules/mysqlbackend/mysqlcbackend.hh (modified) (1 diff)
• modules/oraclebackend/oraclebackend.cc (modified) (2 diffs)
• modules/oraclebackend/oraclebackend.hh (modified) (2 diffs)
• modules/pdnsbackend/pdnsbackend.cc (modified) (2 diffs)
• modules/pdnsbackend/pdnsbackend.hh (modified) (2 diffs)
• modules/pipebackend/pipebackend.cc (modified) (2 diffs)
• modules/pipebackend/pipebackend.hh (modified) (2 diffs)
• modules/xdbbackend/xdbbackend.cc (modified) (1 diff)
• pdns/backends/bind/bindbackend.cc (modified) (2 diffs)
• pdns/backends/bind/bindbackend.hh (modified) (1 diff)
• pdns/backends/bind/bindbackend2.cc (modified) (2 diffs)
• pdns/backends/bind/bindbackend2.hh (modified) (1 diff)
• pdns/backends/gsql/gsqlbackend.cc (modified) (3 diffs)
• pdns/backends/gsql/gsqlbackend.hh (modified) (1 diff)
• pdns/common_startup.cc (modified) (1 diff)
• pdns/dnsbackend.cc (modified) (1 diff)
• pdns/dnsbackend.hh (modified) (2 diffs)
• pdns/packethandler.hh (modified) (1 diff)
• pdns/pdns_recursor.cc (modified) (4 diffs)
• pdns/randombackend.cc (modified) (1 diff)
• pdns/receiver.cc (modified) (2 diffs)
• pdns/tcpreceiver.cc (modified) (1 diff)
• pdns/ueberbackend.cc (modified) (2 diffs)
• pdns/ueberbackend.hh (modified) (1 diff)

trunk/pdns/ChangeLog

@@ -1 +1 @@
 changes since 2.9.10:
         - pdns_recursor now cleans its cache
+        - pdns_recursor writes its pid to disk now (FreeBSD port maintainer)
         - disable-axfr check was reversed (oops)
-        - LDAP now has infrastructure for AXFR (Norbert Sendetzky)
+        - LDAP now supports AXFR and a default TTL
+        - some debugging output messed up the working of pdns_control (Mark Bergsma)
+        - updates to axfr --help output (Norbert Sendetzky)
         
 Changes since 2.9.8:

trunk/pdns/debian/changelog

@@ -1 +1 @@
 pdns (2.9.11-1) unstable; urgency=low
 
-  * fill in the blanks
+  * New upstream release
+  * Do not include zone2ldap in pdns package. Closes: Bug#198613
+  * The gdbm-dev seems to have changed its name, update Build-Depends
+    accordingly. Closes: Bug#199595
 
- -- Wichert Akkerman <wakkerma@debian.org>  Sat, 5 Jul 2003 20:16:16 +0100
-
-pdns (2.9.10-1) unstable; urgency=low
-
-  * fill in the blanks
-
- -- Wichert Akkerman <wakkerma@debian.org>  Thu, 3 Jul 2003 20:16:16 +0100
-
-pdns (2.9.9-1) unstable; urgency=low
-
-  * fill in the blanks
-
- -- Wichert Akkerman <wakkerma@debian.org>  Thu, 27 May 2003 20:16:16 +0100
-
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon, 14 Jul 2003 13:52:47 +0200
 
 pdns (2.9.8-1) unstable; urgency=low
 
-  * fill in the blanks
+  * New upstream release. Closes: Bug#187781
 
- -- Wichert Akkerman <wakkerma@debian.org>  Thu, 30 Apr 2003 20:16:16 +0100
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon,  5 May 2003 13:43:16 +0200
 
 pdns (2.9.7-1) unstable; urgency=low
 
-  * fill in the blanks
+  * New upstream release. Closes: Bug#185730
 
- -- Wichert Akkerman <wakkerma@debian.org>  Thu, 14 Mar 2003 20:16:16 +0100
+ -- Wichert Akkerman <wakkerma@debian.org>  Fri, 21 Mar 2003 12:53:00 +0100
+
+pdns (2.9.6-2) unstable; urgency=low
+
+  * Enable the recursing nameserver
+  * Change order of things in clean target so debian/files is properly
+    removed. Closes: Bug#181994
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Sun, 23 Feb 2003 12:34:57 +0100
 
 pdns (2.9.6-1) unstable; urgency=low
 
-  * fill in the blanks
+  * New upstream release, adding a new LDAP backend
 
- -- Wichert Akkerman <wakkerma@debian.org>  Fri, 14 Feb 2003 20:16:16 +0100
+ -- Wichert Akkerman <wakkerma@debian.org>  Sun, 16 Feb 2003 14:49:08 +0100
+
 
 pdns (2.9.5-1) unstable; urgency=low
@@ -89 +88 @@
 
  -- Wichert Akkerman <wakkerma@debian.org>  Sun,  1 Dec 2002 15:04:52 +0100
+

trunk/pdns/debian/control

@@ -4 +4 @@
 Standards-Version: 3.5.8
 Maintainer: Wichert Akkerman <wakkerma@debian.org>
-Build-Depends: automake1.5, autoconf, libtool, flex, bison, docbook-utils, libmysqlclient10-dev, postgresql-dev, tdb-dev, libgdbmg1-dev, libpqpp-dev, libldap2-dev
+Build-Depends: automake1.5, autoconf, libtool, flex, bison, docbook-utils, libmysqlclient10-dev, postgresql-dev, tdb-dev, libgdbm-dev, libpqpp-dev, libldap2-dev
 
 Package: pdns

trunk/pdns/debian/rules

@@ -84 +84 @@
         rm -f "$(tmpdir)"/usr/bin/binpatch
         rm -f "$(tmpdir)"/usr/bin/xdb-fill
+        rm -f "$(tmpdir)"/usr/bin/zone2ldap
         rm -rf "$(tmpdir)"/usr/lib
 

trunk/pdns/modules/ldapbackend/ldapbackend.cc

@@ -36 +36 @@
         setArgPrefix( "ldap" + suffix );
 
-        L << Logger::Notice << backendname << " LDAP Server = " << getArg( "host" ) << ":" << getArg( "port" ) << endl;
+
+        m_default_ttl = (u_int32_t) strtol( getArg( "default-ttl" ).c_str(), NULL, 10 );
 
         try
         {
+                L << Logger::Info << backendname << " LDAP Server = " << getArg( "host" ) << ":" << getArg( "port" ) << endl;
                 m_pldap = new PowerLDAP( getArg( "host" ), (u_int16_t) atoi( getArg( "port" ).c_str() ) );
                 m_pldap->simpleBind( getArg( "binddn" ), getArg( "secret" ) );
@@ -50 +52 @@
         }
 
-        L << Logger::Notice << backendname << " Ldap connection succeeded" << endl;
+        L << Logger::Info << backendname << " Ldap connection succeeded" << endl;
 }
 
@@ -61 +63 @@
 
 
-bool LdapBackend::list( int domain_id )
-{
-        L << Logger::Warning << backendname << " AXFR is not supported" << endl;
-        return false;
+bool LdapBackend::list( const string &target, int domain_id )
+{
+        string filter, dn;
+        char* attributes[] = { "associatedDomain", NULL };
+
+
+        try
+        {
+                L << Logger::Notice << backendname << " AXFR request for " << target << endl;
+
+                // search for DN of SOA record which is SOA for target zone
+
+                filter = "(&(associatedDomain=" + target + ")(SOARecord=*))";
+                m_msgid = m_pldap->search( getArg("basedn"), LDAP_SCOPE_SUBTREE, filter, (const char**) attributes );
+
+                if( m_pldap->getSearchEntry( m_msgid, m_result, true ) == false )
+                {
+                        L << Logger::Error << backendname << " Unable to get SOA record for " << target << endl;
+                        return false;
+                }
+
+                if( m_result.empty() )
+                {
+                        L << Logger::Error << backendname << " No SOA record for " << target << endl;
+                        return false;
+                }
+
+                if( m_result.find( "dn" ) == m_result.end() )
+                {
+                        L << Logger::Error << backendname << " LDAP error while searching SOA record for " << target << endl;
+                        return false;
+                }
+
+                if( m_result["dn"].empty() )
+                {
+                        L << Logger::Error << backendname << " LDAP error while getting SOA record for " << target << endl;
+                        return false;
+                }
+
+                dn = m_result["dn"].front();
+                m_result.clear();
+
+                // list all records one level below but not entries containing SOA records (these are seperate zones)
+
+                m_qname = "";
+                m_adomain = m_adomains.end();   // skip loops in get() first time
+                filter = "(&(associatedDomain=*)(!(SOARecord=*)))";
+                m_msgid = m_pldap->search( dn, LDAP_SCOPE_ONELEVEL, filter, (const char**) attrany );
+        }
+        catch( LDAPException &le )
+        {
+                L << Logger::Error << backendname << " Unable to get zone " + target + " from LDAP directory: " << le.what() << endl;
+                return false;
+        }
+        catch( exception &e )
+        {
+                L << Logger::Error << backendname << " Caught STL exception: " << e.what() << endl;
+                return false;
+        }
+        catch( ... )
+        {
+                L << Logger::Critical << backendname << " Caught unknown exception" << endl;
+                return false;
+        }
+
+        return true;
 }
 
@@ -73 +137 @@
         vector<string> parts;
         string filter, attr, qesc;
-        char** attributes = attrany;
+        char** attributes = attrany + 1;   // skip associatedDomain
         char* attronly[] = { NULL, "dNSTTL", NULL };
 
@@ -88 +152 @@
                         stringtok( parts, qesc, "." );
 
-                        if( len > 9 && ( qesc.substr( len - 9, 9 ) == ".ip6.arpa" || qesc.substr( len - 8, 8 ) == ".ip6.int" ) )   // IPv6 reverse lookups
+                         if( len > 13 && qesc.substr( len - 13, 13 ) == ".in-addr.arpa" )   // IPv4 reverse lookups
+                        {
+                                parts.pop_back();
+                                parts.pop_back();
+
+                                filter = "(aRecord=" + parts.back();
+                                parts.pop_back();
+                                while( !parts.empty() )
+                                {
+                                        filter += "." + parts.back();
+                                        parts.pop_back();
+                                }
+                                filter += ")";
+
+                                attronly[0] = "associatedDomain";
+                                attributes = attronly;
+                        }
+                        else if( len > 9 && ( qesc.substr( len - 8, 8 ) == ".ip6.int" || qesc.substr( len - 9, 9 ) == ".ip6.arpa" ) )   // IPv6 reverse lookups
                         {
                                 parts.pop_back();
@@ -98 +179 @@
                                 {
                                         filter += ":" + parts.back();
-                                        parts.pop_back();
-                                }
-                                filter += ")";
-
-                                attronly[0] = "associatedDomain";
-                                attributes = attronly;
-                        }
-                        else if( len > 13 && qesc.substr( len - 13, 13 ) == ".in-addr.arpa" )   // IPv4 reverse lookups
-                        {
-                                parts.pop_back();
-                                parts.pop_back();
-
-                                filter = "(aRecord=" + parts.back();
-                                parts.pop_back();
-                                while( !parts.empty() )
-                                {
-                                        filter += "." + parts.back();
                                         parts.pop_back();
                                 }
@@ -146 +210 @@
                 }
 
+                m_adomain = m_adomains.end();   // skip loops in get() first time
                 L << Logger::Info << backendname << " Search = basedn: " << getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl;
                 m_msgid = m_pldap->search( getArg("basedn"), LDAP_SCOPE_SUBTREE, filter, (const char**) attributes );
         }
-        catch( LDAPException &e )
-        {
-                L << Logger::Warning << backendname << " Unable to search LDAP directory: " << e.what() << endl;
+        catch( LDAPException &le )
+        {
+                L << Logger::Warning << backendname << " Unable to search LDAP directory: " << le.what() << endl;
+                return;
+        }
+        catch( exception &e )
+        {
+                L << Logger::Error << backendname << " Caught STL exception: " << e.what() << endl;
                 return;
         }
@@ -166 +236 @@
         QType qt;
         vector<string> parts;
-        vector<string> values;
         string attrname, content, qstr;
-        PowerLDAP::sentry_t::iterator attribute;
 
 
         try
         {
-
-Redo:
-
-                while( !m_result.empty() )
-                {
-                        attribute = m_result.begin();
-                        if( attribute != m_result.end() && !attribute->second.empty() )
-                        {
-                                attrname = attribute->first;
-                                qstr = attrname.substr( 0, attrname.length() - 6 );   // extract qtype string from ldap attribute name
-                                transform( qstr.begin(), qstr.end(), qstr.begin(), &Toupper );
-                                qt = QType( const_cast<char*>(qstr.c_str()) );
-
-                                if( m_qtype.getCode() == QType::ANY ||  m_qtype.getCode() == qt.getCode() )
+                do
+                {
+                        do
+                        {
+                                while( m_adomain != m_adomains.end() )
                                 {
-                                        content = attribute->second.back();
-                                        attribute->second.pop_back();
-
-                                        rr.qtype = qt;
-                                        rr.qname = m_qname;
-                                        rr.priority = 0;
-                                        rr.ttl = m_ttl;
-
-                                        if( qt.getCode() == QType::MX )   // MX Record, e.g. 10 smtp.example.com
+                                        while( m_attribute != m_result.end() )
                                         {
-                                                parts.clear();
-                                                stringtok( parts, content, " " );
-
-                                                if( parts.size() != 2)
+                                                attrname = m_attribute->first;
+                                                qstr = attrname.substr( 0, attrname.length() - 6 );   // extract qtype string from ldap attribute name
+                                                transform( qstr.begin(), qstr.end(), qstr.begin(), &Toupper );
+                                                qt = QType( const_cast<char*>(qstr.c_str()) );
+
+                                                while( m_value != m_attribute->second.end() )
                                                 {
-                                                        L << Logger::Warning << backendname << " Invalid MX record without priority: " << content << endl;
-                                                        goto Redo;
+                                                        content = *m_value;
+
+                                                        rr.qtype = qt;
+                                                        rr.qname = *m_adomain;
+                                                        rr.priority = 0;
+                                                        rr.ttl = m_ttl;
+
+                                                        if( qt.getCode() == QType::MX )   // MX Record, e.g. 10 smtp.example.com
+                                                        {
+                                                                parts.clear();
+                                                                stringtok( parts, content, " " );
+
+                                                                if( parts.size() != 2)
+                                                                {
+                                                                        L << Logger::Warning << backendname << " Invalid MX record without priority: " << content << endl;
+                                                                        continue;
+                                                                }
+
+                                                                rr.priority = (u_int16_t) strtol( parts[0].c_str(), NULL, 10 );
+                                                                content = parts[1];
+                                                        }
+
+                                                        rr.content = content;
+                                                        m_value++;
+
+                                                        L << Logger::Info << backendname << " Record = qname: " << rr.qname << ", qtype: " << (rr.qtype).getName() << ", priority: " << rr.priority << ", content: " << rr.content << endl;
+                                                        return true;
                                                 }
 
-                                                rr.priority = (u_int16_t) strtol( parts[0].c_str(), NULL, 10 );
-                                                content = parts[1];
+                                                m_attribute++;
+                                                m_value = m_attribute->second.begin();
                                         }
-                                        rr.content = content;
-
-                                        L << Logger::Info << backendname << " Record = qname: " << rr.qname << ", qtype: " << (rr.qtype).getName() << ", priority: " << rr.priority << ", content: " << rr.content << endl;
-                                        return true;
+                                        m_adomain++;
+                                        m_attribute = m_result.begin();
+                                        m_value = m_attribute->second.begin();
                                 }
                         }
-                        m_result.erase( attribute );
-                }
-
-                if( m_pldap->getSearchEntry( m_msgid, m_result ) == true )
-                {
-                                if( m_result.find( "dNSTTL" ) != m_result.end() && m_result["dNSTTL"].size() > 0 )
-                                {
-                                        m_ttl = (u_int32_t) strtol( m_result["dNSTTL"][0].c_str(), NULL, 10 );
-                                        m_result.erase( "dNSTTL" );
-                                }
-                                else
-                                {
-                                        m_ttl = (u_int32_t) strtol( getArg( "default-ttl" ).c_str(), NULL, 10 );
-                                }
-
-                                if( m_result.find( "associatedDomain" ) != m_result.end() )
-                                {
-                                        m_result["PTRRecord"] = m_result["associatedDomain"];
-                                        m_result.erase( "associatedDomain" );
-                                }
-
-                                goto Redo;
-                }
-        }
-        catch( LDAPException &e )
-        {
-                L << Logger::Warning << backendname << " Search failed: " << e.what() << endl;
+                        while( !m_adomains.empty() && m_qname.empty() && mustDo( "disable-ptrrecord" ) && makePtrRecords() );   // make PTR records from associatedDomain entries
+
+                        m_result.clear();
+                }
+                while( m_pldap->getSearchEntry( m_msgid, m_result, false ) && prepSearchEntry() );
+
+        }
+        catch( LDAPException &le )
+        {
+                L << Logger::Warning << backendname << " Search failed: " << le.what() << endl;
+        }
+        catch( exception &e )
+        {
+                L << Logger::Error << backendname << " Caught STL exception: " << e.what() << endl;
         }
         catch( ... )
@@ -250 +314 @@
 
         return false;
+}
+
+
+inline bool LdapBackend::prepSearchEntry()
+{
+        m_adomains.clear();
+        m_ttl = m_default_ttl;
+
+        if( m_result.find( "dNSTTL" ) != m_result.end() && !m_result["dNSTTL"].empty() )
+        {
+                m_ttl = (u_int32_t) strtol( m_result["dNSTTL"][0].c_str(), NULL, 10 );
+                m_result.erase( "dNSTTL" );
+        }
+
+        if( !m_qname.empty() )   // request was a normal lookup()
+        {
+                m_adomains.push_back( m_qname );
+                if( m_result.find( "associatedDomain" ) != m_result.end() )
+                {
+                        m_result["PTRRecord"] = m_result["associatedDomain"];
+                        m_result.erase( "associatedDomain" );
+                }
+        }
+        else   // request was a list() for AXFR
+        {
+                if( m_result.find( "associatedDomain" ) != m_result.end() )
+                {
+                        m_adomains = m_result["associatedDomain"];
+                        m_result.erase( "associatedDomain" );
+                }
+        }
+
+        m_adomain = m_adomains.begin();
+        m_attribute = m_result.begin();
+        m_value = m_attribute->second.begin();
+
+        return true;
+}
+
+
+inline bool LdapBackend::makePtrRecords()
+{
+        unsigned int i = 0;
+        string ptrsrc;
+        vector<string> parts, tmp;
+        vector<string>::iterator record;
+        char* attr[] = { "aRecord", "aAAARecord", NULL };
+        char* suffix[] = { ".in-addr.arpa", ".ip6.int", NULL };
+        char* seperator[] = { ".", ":", NULL };
+
+
+        tmp = m_adomains;
+        m_adomains.clear();
+
+        while( attr[i] != NULL && m_result.find( attr[i] ) != m_result.end() )
+        {
+                for( record = m_result[attr[i]].begin(); record != m_result[attr[i]].end(); record++ )
+                {
+                        parts.clear();
+                        stringtok( parts, *record, seperator[i] );
+
+                        ptrsrc = parts.back();
+                        parts.pop_back();
+                        while( !parts.empty() )
+                        {
+                                ptrsrc += "." + parts.back();
+                                parts.pop_back();
+                        }
+                        ptrsrc += suffix[i];
+
+                        m_adomains.push_back( ptrsrc );
+                }
+
+                i++;
+        }
+
+        if( m_adomains.empty() )
+        {
+                return false;
+        }
+
+        m_result.clear();
+        m_result["PTRRecord"] = tmp;
+        m_adomain = m_adomains.begin();
+        m_attribute = m_result.begin();
+        m_value = m_attribute->second.begin();
+
+        return true;
 }
 

trunk/pdns/modules/ldapbackend/ldapbackend.hh

@@ -49 +49 @@
 
 static char* attrany[] = {
+        "associatedDomain",
         "dNSTTL",
         "aRecord",
@@ -73 +74 @@
         int m_msgid;
         u_int32_t m_ttl;
+        u_int32_t m_default_ttl;
         QType m_qtype;
         string m_qname;
         PowerLDAP* m_pldap;
         PowerLDAP::sentry_t m_result;
+        PowerLDAP::sentry_t::iterator m_attribute;
+        vector<string>::iterator m_value, m_adomain;
+        vector<string> m_adomains;
+
+        bool prepSearchEntry();
+        bool makePtrRecords();
 
 public:
@@ -84 +92 @@
 
         void lookup( const QType &qtype, const string &qdomain, DNSPacket *p=0, int zoneid=-1 );
-        bool list( int domain_id );
+        bool list( const string &target, int domain_id );
         bool get( DNSResourceRecord &rr );
 };

trunk/pdns/modules/mysqlbackend/mysqlcbackend.cc

@@ -1 @@
-// $Id: mysqlcbackend.cc,v 1.3 2003/01/06 16:13:59 ahu Exp $ 
+// $Id: mysqlcbackend.cc,v 1.4 2003/08/22 13:33:31 ahu Exp $ 
 #include <string>
 #include <map>
@@ -104 +104 @@
 }
 
-bool MySQLBackend::list(int domain_id )
+bool MySQLBackend::list(const string &target, int domain_id )
 {
   DLOG(L<<backendName<<" MySQLBackend constructing handle for list of domain id '"<<domain_id<<"'"<<endl);

trunk/pdns/modules/mysqlbackend/mysqlcbackend.hh

@@ -23 +23 @@
   
   void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
-  bool list(int domain_id);
+  bool list(const string &target, int domain_id);
   bool get(DNSResourceRecord &r);
     

trunk/pdns/modules/oraclebackend/oraclebackend.cc

@@ -1 @@
-// $Id: oraclebackend.cc,v 1.1 2002/11/27 15:35:52 ahu Exp $
+// $Id: oraclebackend.cc,v 1.2 2003/08/22 13:33:31 ahu Exp $
 
 #include <string>
@@ -376 +376 @@
 }
 
-bool OracleBackend::list(int domain_id)
+bool OracleBackend::list(const string &target, int domain_id)
 {
    mQueryId = domain_id;

trunk/pdns/modules/oraclebackend/oraclebackend.hh

@@ -1 @@
-// $Id: oraclebackend.hh,v 1.1 2002/11/27 15:35:52 ahu Exp $
+// $Id: oraclebackend.hh,v 1.2 2003/08/22 13:33:31 ahu Exp $
 
 #include <string>
@@ -73 +73 @@
       
       void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
-      bool list(int domain_id);
+      bool list(const string &target, int domain_id);
       bool get(DNSResourceRecord &r);
       

trunk/pdns/modules/pdnsbackend/pdnsbackend.cc

@@ -1 @@
-// $Id: pdnsbackend.cc,v 1.5 2003/03/13 12:45:30 ahu Exp $ 
+// $Id: pdnsbackend.cc,v 1.6 2003/08/22 13:33:31 ahu Exp $ 
 
 #include <string>
@@ -129 +129 @@
 }
 
-bool PdnsBackend::list(int inZoneId)
+bool PdnsBackend::list(const string &target, int inZoneId)
 {
    //cout << "PdnsBackend::list" << endl;

trunk/pdns/modules/pdnsbackend/pdnsbackend.hh

@@ -1 @@
-// $Id: pdnsbackend.hh,v 1.4 2003/03/13 12:45:30 ahu Exp $
+// $Id: pdnsbackend.hh,v 1.5 2003/08/22 13:33:31 ahu Exp $
 
 #ifndef PDNSBACKEND_HH
@@ -19 +19 @@
 
       void lookup(const QType &, const string &qdomain, DNSPacket *p = 0, int zoneId = -1);
-      bool list(int inZoneId);
+      bool list(const string &target, int inZoneId);
       bool get(DNSResourceRecord& outRecord);
       bool getSOA(const string &name, SOAData &soadata);

trunk/pdns/modules/pipebackend/pipebackend.cc

@@ -1 +1 @@
 // -*- sateh-c -*- 
 // File    : pdnsbackend.cc
-// Version : $Id: pipebackend.cc,v 1.4 2002/12/16 13:04:27 ahu Exp $ 
+// Version : $Id: pipebackend.cc,v 1.5 2003/08/22 13:33:31 ahu Exp $ 
 //
 
@@ -119 +119 @@
 }
 
-bool PipeBackend::list(int inZoneId)
+bool PipeBackend::list(const string &target, int inZoneId)
 {
    try {

trunk/pdns/modules/pipebackend/pipebackend.hh

@@ -1 +1 @@
 //
 // File    : pdnsbackend.hh
-// Version : $Id: pipebackend.hh,v 1.1 2002/11/27 15:31:59 ahu Exp $
+// Version : $Id: pipebackend.hh,v 1.2 2003/08/22 13:33:31 ahu Exp $
 //
 
@@ -60 +60 @@
   ~PipeBackend();
   void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
-  bool list(int domain_id);
+  bool list(const string &target, int domain_id);
   bool get(DNSResourceRecord &r);
   

trunk/pdns/modules/xdbbackend/xdbbackend.cc

@@ -31 +31 @@
   }
 
-  bool list(int id) {
+  bool list(const string &target, int id) {
     return false; // we don't support AXFR (go away)
   }

trunk/pdns/pdns/backends/bind/bindbackend.cc

@@ -16 +16 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: bindbackend.cc,v 1.15 2003/02/10 11:09:09 ahu Exp $ 
+// $Id: bindbackend.cc,v 1.16 2003/08/22 13:33:31 ahu Exp $ 
 #include <errno.h>
 #include <string>
@@ -757 +757 @@
 }
 
-bool BindBackend::list(int id)
+bool BindBackend::list(const string &target, int id)
 {
   if(!d_zone_id_map.count(id))

trunk/pdns/pdns/backends/bind/bindbackend.hh

@@ -178 +178 @@
 
   void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
-  bool list(int id);
+  bool list(const string &target, int id);
   bool get(DNSResourceRecord &);
 

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -16 +16 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: bindbackend2.cc,v 1.3 2003/03/20 13:29:29 ahu Exp $ 
+// $Id: bindbackend2.cc,v 1.4 2003/08/22 13:33:31 ahu Exp $ 
 #include <errno.h>
 #include <string>
@@ -727 +727 @@
 }
 
-bool Bind2Backend::list(int id)
-{
-  cout<<"List of id "<<id<<" requested"<<endl;
+bool Bind2Backend::list(const string &target, int id)
+{
+  // cout<<"List of id "<<id<<" requested"<<endl;
   if(!s_id_zone_map.count(id))
     return false;

trunk/pdns/pdns/backends/bind/bindbackend2.hh

@@ -179 +179 @@
 
   void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
-  bool list(int id);
+  bool list(const string &target, int id);
   bool get(DNSResourceRecord &);
 

trunk/pdns/pdns/backends/gsql/gsqlbackend.cc

@@ -1 @@
-// $Id: gsqlbackend.cc,v 1.8 2003/06/21 09:59:08 ahu Exp $ 
+// $Id: gsqlbackend.cc,v 1.9 2003/08/22 13:33:31 ahu Exp $ 
 #include <string>
 #include <map>
@@ -134 +134 @@
     sd.id=atol(d_result[n][0].c_str());
     sd.zone=d_result[n][1];
-    cout<<"master='"<<d_result[n][2]<<"'"<<endl;
     sd.master=d_result[n][2];
     sd.last_check=atol(d_result[n][3].c_str());
@@ -301 +300 @@
   d_count=0;
 }
-bool GSQLBackend::list(int domain_id )
+bool GSQLBackend::list(const string &target, int domain_id )
 {
   DLOG(L<<"GSQLBackend constructing handle for list of domain id'"<<domain_id<<"'"<<endl);

trunk/pdns/pdns/backends/gsql/gsqlbackend.hh

@@ -24 +24 @@
   string sqlEscape(const string &name);
   void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
-  bool list(int domain_id);
+  bool list(const string &target, int domain_id);
   bool get(DNSResourceRecord &r);
   bool isMaster(const string &domain, const string &ip);

trunk/pdns/pdns/common_startup.cc

@@ -76 +76 @@
   arg().set("launch","Which backends to launch and order to query them in")="";
   arg().setSwitch("disable-axfr","Disable zonetransfers but do allow TCP queries")="no";
-  arg().set("allow-axfr-ips","If disabled, DO allow zonetransfers from these IP addresses")="";
+  arg().set("allow-axfr-ips","Allow zonetransfers only from these IP addresses")="";
   arg().set("slave-cycle-interval","Reschedule failed SOA serial checks once every .. seconds")="60";
   

trunk/pdns/pdns/dnsbackend.cc

@@ -240 +240 @@
     time_t newest=0;
 
-    if(!(this->list(sd.domain_id))) 
+    if(!(this->list(domain, sd.domain_id))) 
       throw AhuException("Backend error trying to determine magic serial number of zone '"+domain+"'");
   

trunk/pdns/pdns/dnsbackend.hh

@@ -17 +17 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: dnsbackend.hh,v 1.5 2002/12/30 21:00:56 ahu Exp $
+// $Id: dnsbackend.hh,v 1.6 2003/08/22 13:33:31 ahu Exp $
 /* (C) 2002 POWERDNS.COM BV  */
    
@@ -81 +81 @@
       \param domain_id ID of which a list is requested
   */
-  virtual bool list(int domain_id)=0;  
+  virtual bool list(const string &target, int domain_id)=0;  
 
   virtual ~DNSBackend(){};

trunk/pdns/pdns/packethandler.hh

@@ -31 +31 @@
 
 using namespace std;
+
+// silly Solaris people define PC
+#undef PC
 
 /** Central DNS logic according to RFC1034. Ask this class a question in the form of a DNSPacket

trunk/pdns/pdns/pdns_recursor.cc

@@ -36 +36 @@
 #include "arguments.hh"
 #include "syncres.hh"
+#include <fcntl.h>
+#include <fstream>
+
+string s_programname="pdns_recursor";
 
 #ifndef WIN32
@@ -161 +165 @@
 
 
+static void writePid(void)
+{
+  string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
+  ofstream of(fname.c_str());
+  if(of)
+    of<<getpid()<<endl;
+  else
+    L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"failed: "<<strerror(errno)<<endl;
+}
+
 void init(void)
 {
@@ -432 +446 @@
     arg().set("quiet","Suppress logging of questions and answers")="off";
     arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
+    arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
     arg().setCmd("help","Provide a helpful message");
     L.toConsole(Logger::Warning);
@@ -471 +486 @@
     }
     signal(SIGUSR1,usr1Handler);
+
+    writePid();
 #endif
 

trunk/pdns/pdns/randombackend.cc

@@ -35 +35 @@
   }
 
-  bool list(int id) {
+  bool list(const string &target, int id) {
     return false; // we don't support AXFR
   }

trunk/pdns/pdns/receiver.cc

@@ -17 +17 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: receiver.cc,v 1.8 2003/03/06 16:59:11 ahu Exp $
+// $Id: receiver.cc,v 1.9 2003/08/22 13:33:31 ahu Exp $
 #include <cstdio>
 #include <signal.h>
@@ -156 +156 @@
 {
   kill(cpid,SIGKILL); // why?
+  kill(cpid,SIGKILL); // why?
+  
+  sleep(1);
   return "ok";
 }

trunk/pdns/pdns/tcpreceiver.cc

@@ -331 +331 @@
 
   // now list zone
-  if(!(B->list(sd.domain_id))) {  
+  if(!(B->list(target, sd.domain_id))) {  
     L<<Logger::Error<<"Backend signals error condition"<<endl;
     outpacket->setRcode(2); // 'SERVFAIL'

trunk/pdns/pdns/ueberbackend.cc

@@ -17 +17 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: ueberbackend.cc,v 1.10 2003/02/10 11:09:09 ahu Exp $ 
+// $Id: ueberbackend.cc,v 1.11 2003/08/22 13:33:31 ahu Exp $ 
 /* (C) Copyright 2002 PowerDNS.COM BV */
 #include "utility.hh"
@@ -372 +372 @@
 }
 
-bool UeberBackend::list(int domain_id)
+bool UeberBackend::list(const string &target, int domain_id)
 {
   L<<Logger::Error<<"UeberBackend::list called, should NEVER EVER HAPPEN"<<endl;

trunk/pdns/pdns/ueberbackend.hh

@@ -116 +116 @@
 
   bool getSOA(const string &domain, SOAData &sd);
-  bool list(int domain_id);
+  bool list(const string &target, int domain_id);
   bool get(DNSResourceRecord &r);