From: Bert Hubert Date: Thu, 6 Mar 2003 16:59:11 +0000 (+0000) Subject: little things X-Git-Tag: pdns-2.9.7~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1663439b6823a94d05f9816a242242cc5e7881f;p=pdns 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 d6779142d..a71f9c9fe 100644 --- 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 73e6129a5..c89d2addc 100644 --- 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 6eb394e3a..6f27ceb90 100644 --- 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 76df39fb0..e20288f9c 100644 --- a/pdns/communicator.cc +++ b/pdns/communicator.cc @@ -196,7 +196,7 @@ void CommunicatorClass::masterUpdateCheck(PacketHandler *P) if(cmdomains.empty()) { if(d_masterschanged) - L<1 ? "s" : "")<<" need"<< + L<1 ? "s" : "")<<" need"<< (sdomains.size()>1 ? "" : "s")<< " checking"<backend->setFresh(i->id); } else { - L<zone<<" is stale, master serial "<serial<zone<<" is stale, master serial "<serial<zone,i->master); } } diff --git a/pdns/misc.cc b/pdns/misc.cc index e19cb09c7..a1bfafb7f 100644 --- 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: '"< #include #include @@ -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<0) { // parent diff --git a/pdns/resolver.cc b/pdns/resolver.cc index 57769f4ec..7cf02d3cf 100644 --- 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 acd0d4bbd..0f5348e25 100644 --- 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! setbeenthere; - 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 fc3cf214f..b17ddd72d 100644 --- 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");