From dcf9bd8f60e6642201530ce98d486511fd218917 Mon Sep 17 00:00:00 2001 From: Bert Hubert Date: Thu, 3 Jul 2003 09:48:02 +0000 Subject: [PATCH] 2.9.10 git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@176 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- configure.in | 2 +- debian/changelog | 6 ++++ modules/ldapbackend/ldapbackend.cc | 2 +- modules/ldapbackend/powerldap.cc | 4 +-- modules/ldapbackend/powerldap.hh | 2 +- pdns.spec | 2 +- pdns/docs/pdns.sgml | 52 +++++++++++++++++++++++++----- pdns/pdns_recursor.cc | 4 ++- 8 files changed, 59 insertions(+), 15 deletions(-) diff --git a/configure.in b/configure.in index 1d75071c4..38766fdd9 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl intro AC_INIT(pdns/receiver.cc) -AM_INIT_AUTOMAKE(pdns, 2.9.9) +AM_INIT_AUTOMAKE(pdns, 2.9.10) AC_CANONICAL_HOST AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN diff --git a/debian/changelog b/debian/changelog index 199c762cd..d8550dde6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pdns (2.9.10-1) unstable; urgency=low + + * fill in the blanks + + -- Wichert Akkerman Thu, 3 Jul 2003 20:16:16 +0100 + pdns (2.9.9-1) unstable; urgency=low * fill in the blanks diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc index 0ce00bcd8..5c17ab4f6 100644 --- a/modules/ldapbackend/ldapbackend.cc +++ b/modules/ldapbackend/ldapbackend.cc @@ -146,7 +146,7 @@ void LdapBackend::lookup( const QType &qtype, const string &qname, DNSPacket *dn } L << Logger::Info << backendname << " Search = basedn: " << getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl; - m_msgid = m_pldap->search( getArg("basedn"), filter, (const char**) attributes ); + m_msgid = m_pldap->search( getArg("basedn"), LDAP_SCOPE_SUBTREE, filter, (const char**) attributes ); } catch( LDAPException &e ) { diff --git a/modules/ldapbackend/powerldap.cc b/modules/ldapbackend/powerldap.cc index 84d0a748a..9071baf4d 100644 --- a/modules/ldapbackend/powerldap.cc +++ b/modules/ldapbackend/powerldap.cc @@ -72,11 +72,11 @@ int PowerLDAP::waitResult(int msgid,LDAPMessage **retresult) } -int PowerLDAP::search(const string& base, const string& filter, const char **attr) +int PowerLDAP::search(const string& base, int scope, const string& filter, const char **attr) { int msgid; - if( ( msgid = ldap_search( d_ld, base.c_str(), LDAP_SCOPE_SUBTREE, filter.c_str(),const_cast(attr),0 ) ) == -1 ) + if( ( msgid = ldap_search( d_ld, base.c_str(), scope, filter.c_str(),const_cast(attr),0 ) ) == -1 ) throw LDAPException("Starting LDAP search: "+getError()); return msgid; diff --git a/modules/ldapbackend/powerldap.hh b/modules/ldapbackend/powerldap.hh index 116dea8fc..e9e74ee07 100644 --- a/modules/ldapbackend/powerldap.hh +++ b/modules/ldapbackend/powerldap.hh @@ -33,7 +33,7 @@ public: PowerLDAP(const string &host="127.0.0.1", u_int16_t port=389); void simpleBind(const string &ldapbinddn="", const string& ldapsecret=""); - int search(const string& base, const string& filter, const char **attr=0); + int search(const string& base, int scope, const string& filter, const char **attr=0); bool getSearchEntry(int msgid, sentry_t &entry); void getSearchResults(int msgid, sresult_t &result); ~PowerLDAP(); diff --git a/pdns.spec b/pdns.spec index 5b348f51e..c4649de13 100644 --- a/pdns.spec +++ b/pdns.spec @@ -1,6 +1,6 @@ Buildroot: /tmp/pdns Name: pdns-static -Version: 2.9.8 +Version: 2.9.10 Release: 1 Summary: extremely powerful and versatile nameserver Copyright: see /usr/doc/pdns/copyright diff --git a/pdns/docs/pdns.sgml b/pdns/docs/pdns.sgml index 948c4b81e..fba1f8da4 100644 --- a/pdns/docs/pdns.sgml +++ b/pdns/docs/pdns.sgml @@ -11,7 +11,7 @@ - v2.1 $Date: 2003/06/28 16:46:01 $ + v2.1 $Date: 2003/07/03 09:48:02 $ @@ -81,15 +81,30 @@ Before proceeding, it is advised to check the release notes for your PDNS version, as specified in the name of the distribution file. - Version 2.9.9 + Version 2.9.10 - Small bugfixes, LDAP update. Released 21th of June 2003. Apologies for the long delay, real life keeps interfering. + Small bugfixes, LDAP update. Released 3rd of July 2003. Apologies for the long delay, real life keeps interfering. + + + + + Do not use or try to use 2.9.9, it was a botched release! + + + + + + + There has been a change in behaviour whereby disable-axfr does what it means now! From now + on, setting allow-axfr-ips automatically disables AXFR from unmentioned subnets. + + - 2.9.8 was prone to crash on adding additional records. Thanks to excelent debugging by PowerDNS users worldwide, the bug was found + 2.9.8 was prone to crash on adding additional records. Thanks to excellent debugging by PowerDNS users worldwide, the bug was found quickly and is in fact present in all earlier PowerDNS releases, but for some reason doesn't cause crashes there. @@ -107,12 +122,18 @@ - LDAP: DNS TTLs were random values (Norbert Sendetzky) + pdns_recursor may have logged empty lines for some users, fixed. Solution suggested by Norbert Sendetzky. - LDAP: Now works with OpenLDAP 2.1(Norbert Sendetzky) + LDAP: DNS TTLs were random values (Norbert Sendetzky, Stefan Pfetzing). New ldap-default-ttl + option. + + + + + LDAP: Now works with OpenLDAP 2.1 (Norbert Sendetzky) @@ -130,6 +151,11 @@ LDAP: code cleanup of lookup() (Norbert Sendetzky) + + + LDAP: added support for scoped searches (Norbert Sendetzky) + + Version 2.9.8 @@ -4784,7 +4810,9 @@ Feb 10 14:16:03 stats: 125784 questions, 13971 cache entries, 309 negative entri allow-axfr-ips=... - When not allowing AXFR (disable-axfr), DO allow from these IP addresses or netmasks. + Behaviour pre 2.9.10: When not allowing AXFR (disable-axfr), DO allow from these IP addresses or netmasks. + + Behaviour post 2.9.10: If set, only these IP addresses or netmasks will be able to perform AXFR. @@ -4825,7 +4853,7 @@ Feb 10 14:16:03 stats: 125784 questions, 13971 cache entries, 309 negative entri disable-axfr=... - Do not allow zone transfers + Do not allow zone transfers. Before 2.9.10, this could be overridden by allow-axfr-ips. disable-tcp=... @@ -7609,6 +7637,14 @@ insert into Records (id,ZoneId, name,type,content,TimeToLive,Priority) select RE + + ldap-default-ttl + + + TTL for records with no dnsttl attribute. Defaults to 86400 seconds. + + + diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 9d0181709..e39ea050f 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -43,8 +43,10 @@ extern "C" { int sem_trywait(sem_t*){return 0;} int sem_post(sem_t*){return 0;} int sem_getvalue(sem_t*, int*){return 0;} - pthread_t pthread_self(void){pthread_t tmp; return tmp;} + pthread_t pthread_self(void){return (pthread_t) 0;} int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr){ return 0; } + int pthread_mutex_lock(pthread_mutex_t *mutex){ return 0; } + int pthread_mutex_unlock(pthread_mutex_t *mutex) { return 0; } } #endif // WIN32 -- 2.40.0