little things

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@157 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/ChangeLog b/ChangeLog
index d6779142dafaa64ce7595f26f9e07613255d5941..a71f9c9fee9e29cd7eb91d47f9e62080dd8ad81c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,16 @@ Changes since 2.9.6:
        - removed vestigal receiver-threads setting
        - ldapbackend needs to include utility.hh (Remco Post)
        - pdns_control could sometimes leave files behind in /tmp (dG)
-       - ldapbackend updates   
-
+       - ldapbackend updates 
+       - TCP incoming AXFR fixes for Solaris and other big endian systems 
+         (Willem de Groot helped debug)
+       - bogus error message about unparseable packets (Mark Bergsma)
+       - solved potential crash in recursor (Dan Faerch delivered coredump)
+       - when started via a path, pdns_server could not always find itself (Maurice Nonnekes)
+       - silly wuh debugging output in zone2sql/bindbackend (Ivo van der Wijk)
+       - pdns_recursor lived in the 'bin' and not the 'sbin' directory (Norbert Sendetzky)
+       - chatter from master/slave backend is not 'Error'-worthy (Willem)
+       
 Changes since 2.9.5:
        - implemented isMaster in bindbackend (we now react to notifies)
        - added zoneId to mboxfw stuff - massive speedup

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 73e6129a5d9485029d0fb01fcec45eeb6308d066..c89d2addc735748cba900ead0a95e3e96add481d 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -11,12 +11,12 @@ noinst_SCRIPTS = pdns
 sysconf_DATA = pdns.conf-dist 
 
 if RECURSOR
-bin_PROGRAMS = pdns_control pdns_recursor
+sbin_PROGRAMS = pdns_server pdns_recursor
 else
-bin_PROGRAMS = pdns_control 
+sbin_PROGRAMS = pdns_server
 endif
 
-sbin_PROGRAMS = pdns_server 
+bin_PROGRAMS = pdns_control
 
 EXTRA_PROGRAMS=pdns_recursor pdns_control
 
@@ -35,7 +35,7 @@ backends/bind/bindbackend2.cc backends/bind/zoneparser2.cc \
 backends/bind/bindparser.cc backends/bind/bindlexer.c \
 backends/bind/huffman.cc backends/gsql/gsqlbackend.cc \
 backends/gsql/gsqlbackend.hh backends/gsql/ssql.hh \
-sillyrecords.cc 
+sillyrecords.cc backends/bind/bindbackend.cc
 
 #
 pdns_server_LDFLAGS= @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@

diff --git a/pdns/backends/bind/Makefile.am b/pdns/backends/bind/Makefile.am
index 6eb394e3a806096ebcc688a94b5525c33030445c..6f27ceb903d1cd6e0716f879b15e71e36ae1e20f 100644 (file)
--- a/pdns/backends/bind/Makefile.am
+++ b/pdns/backends/bind/Makefile.am
@@ -1,7 +1,12 @@
 INCLUDES=-I../..
-noinst_LTLIBRARIES = libbindbackend.la
+noinst_LTLIBRARIES = libbindbackend.la libbind2backend.la
 
-libbindbackend_la_SOURCES=bindbackend2.cc bindbackend2.hh bindparser.yy \
+libbindbackend_la_SOURCES=bindbackend.cc bindbackend.hh bindparser.yy \
+bindlexer.l zoneparser2.cc ../../misc.cc huffman.cc huffman.hh zoneparser.hh \
+bindparser.hh ../../unix_utility.cc
+
+
+libbind2backend_la_SOURCES=bindbackend2.cc bindbackend2.hh bindparser.yy \
 bindlexer.l zoneparser2.cc ../../misc.cc huffman.cc huffman.hh zoneparser.hh \
 bindparser.hh ../../unix_utility.cc
 

diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index 76df39fb0cfda60c2d470556be5612ed402ede64..e20288f9c24b6e9692b6be983a4d38153a365ae6 100644 (file)
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -196,7 +196,7 @@ void CommunicatorClass::masterUpdateCheck(PacketHandler *P)
   
   if(cmdomains.empty()) {
     if(d_masterschanged)
-      L<<Logger::Error<<"No master domains need notifications"<<endl;
+      L<<Logger::Warning<<"No master domains need notifications"<<endl;
     d_masterschanged=false;
   }
   else {
@@ -225,12 +225,12 @@ void CommunicatorClass::slaveRefresh(PacketHandler *P)
   if(sdomains.empty())
   {
     if(d_slaveschanged)
-      L<<Logger::Error<<"All slave domains are fresh"<<endl;
+      L<<Logger::Warning<<"All slave domains are fresh"<<endl;
     d_slaveschanged=false;
     return;
   }
   else 
-    L<<Logger::Error<<sdomains.size()<<" slave domain"<<(sdomains.size()>1 ? "s" : "")<<" need"<<
+    L<<Logger::Warning<<sdomains.size()<<" slave domain"<<(sdomains.size()>1 ? "s" : "")<<" need"<<
       (sdomains.size()>1 ? "" : "s")<<
       " checking"<<endl;
   
@@ -255,7 +255,7 @@ void CommunicatorClass::slaveRefresh(PacketHandler *P)
        i->backend->setFresh(i->id);
       }
       else {
-       L<<Logger::Error<<"Domain "<<i->zone<<" is stale, master serial "<<theirserial<<", our serial "<<i->serial<<endl;
+       L<<Logger::Warning<<"Domain "<<i->zone<<" is stale, master serial "<<theirserial<<", our serial "<<i->serial<<endl;
        addSuckRequest(i->zone,i->master);
       }
     }

diff --git a/pdns/misc.cc b/pdns/misc.cc
index e19cb09c7c23dad0c29a4ee08d57cf2864c643d3..a1bfafb7fac881f41af419034edb7f1ce4ea6b5c 100644 (file)
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -264,7 +264,6 @@ const string unquotify(const string &item)
   if(item[0]=='"') 
     bpos=1;
 
-  cout<<"wuh: '"<<item[epos-1]<<"'"<<endl;
   if(item[epos-1]=='"')
     epos-=1;
 

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index a132fff75377ca2118331ace6ac60a6aacdf7695..dcedd4e2344c343280064ff0256fac5d97f74910 100644 (file)
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: receiver.cc,v 1.7 2003/03/04 18:33:39 ahu Exp $
+// $Id: receiver.cc,v 1.8 2003/03/06 16:59:11 ahu Exp $
 #include <cstdio>
 #include <signal.h>
 #include <cstring>
@@ -220,15 +220,15 @@ static int guardian(int argc, char **argv)
        dup2(d_fd2[1], outfd);
        close(d_fd2[1]);
       }
-      if(execv(argv[0], newargv)<0) {
-       L<<Logger::Error<<"Unable to execv '"<<argv[0]<<"': "<<strerror(errno)<<endl;
+      if(execvp(argv[0], newargv)<0) {
+       L<<Logger::Error<<"Unable to execvp '"<<argv[0]<<"': "<<strerror(errno)<<endl;
        char **p=newargv;
        while(*p)
          L<<Logger::Error<<*p++<<endl;
 
        exit(1);
       }
-      L<<Logger::Error<<"execve returned!!"<<endl;
+      L<<Logger::Error<<"execvp returned!!"<<endl;
       // never reached
     }
     else if(pid>0) { // parent

diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index 57769f4ec8b79024ab97a27d2c6af53cd82055eb..7cf02d3cf5de327f7007ef1339da6705b9df5339 100644 (file)
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -303,7 +303,7 @@ int Resolver::axfr(const string &ip, const char *domain)
   p.setQuestion(Opcode::Query,domain,QType::AXFR);
   p.wrapup();
 
-  int replen=htons(p.len);
+  u_int16_t replen=htons(p.len);
   Utility::iovec iov[2];
   iov[0].iov_base=(char*)&replen;
   iov[0].iov_len=2;

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index acd0d4bbdca39e13c978262153628c5f2343647d..0f5348e254d6e78ae79c723a330eb62a85cf35c8 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -178,7 +178,7 @@ bool SyncRes::doCNAMECacheCheck(const string &qname, const QType &qtype, vector<
        ret.push_back(rr);
        if(!(qtype==QType(QType::CNAME))) {// perhaps they really wanted a CNAME!
          set<GetBestNSAnswer>beenthere;
-         res=doResolve(j->content, qtype, ret, depth, beenthere);
+         res=doResolve(j->content, qtype, ret, depth+1, beenthere);
        }
        return true;
       }

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index fc3cf214f4ad3a70de582c6d95ab939a10b71b5a..b17ddd72d0429cb911d76157702dfe15cdcc84e8 100644 (file)
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -157,11 +157,11 @@ void *TCPNameserver::doConnection(void *data)
       S.inc("tcp-queries");      
       DNSPacket *packet=new DNSPacket;
 
-      if(packet->parse(mesg, pktlen)<0)
-       break;
-
       packet->setRemote((struct sockaddr *)&remote,sizeof(remote));
 
+      if(packet->parse(mesg, pktlen)<0)
+       break;
+      
       if(packet->qtype.getCode()==QType::AXFR) {
        if(doAXFR(packet->qdomain, packet, fd)) 
          S.inc("tcp-answers");