|
[-]
[+]
|
Changed |
pdns.changes
|
|
|
|
[-]
[+]
|
Changed |
pdns.spec
^
|
|
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/codedocs/Makefile
^
|
| @@ -31,8 +31,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
subdir = codedocs
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -46,12 +46,12 @@
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/vagrant/pdns-2-9-22-x/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/vagrant/pdns-2-9-22-x/missing --run tar
+ACLOCAL = ${SHELL} /home/peter/pdns-2-9-22-x/missing --run aclocal-1.11
+AMTAR = ${SHELL} /home/peter/pdns-2-9-22-x/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/vagrant/pdns-2-9-22-x/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/vagrant/pdns-2-9-22-x/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/vagrant/pdns-2-9-22-x/missing --run automake-1.11
+AUTOCONF = ${SHELL} /home/peter/pdns-2-9-22-x/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/peter/pdns-2-9-22-x/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/peter/pdns-2-9-22-x/missing --run automake-1.11
AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -80,7 +80,7 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
+LD = /usr/bin/ld
LDFLAGS =
LEX = flex
LEXLIB = -lfl
@@ -94,7 +94,7 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/vagrant/pdns-2-9-22-x/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/peter/pdns-2-9-22-x/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MYSQL_incdir = /usr/include/mysql
MYSQL_lib =
@@ -124,13 +124,13 @@
SQLITE_lib =
STRIP = strip
THREADFLAGS = -pthread
-VERSION = 2.9.22.5
+VERSION = 2.9.22.6
YACC = bison -y
YFLAGS =
-abs_builddir = /home/vagrant/pdns-2-9-22-x/codedocs
-abs_srcdir = /home/vagrant/pdns-2-9-22-x/codedocs
-abs_top_builddir = /home/vagrant/pdns-2-9-22-x
-abs_top_srcdir = /home/vagrant/pdns-2-9-22-x
+abs_builddir = /home/peter/pdns-2-9-22-x/codedocs
+abs_srcdir = /home/peter/pdns-2-9-22-x/codedocs
+abs_top_builddir = /home/peter/pdns-2-9-22-x
+abs_top_srcdir = /home/peter/pdns-2-9-22-x
ac_ct_CC = gcc
ac_ct_CXX = g++
ac_ct_DUMPBIN =
@@ -140,26 +140,26 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
+build = i686-pc-linux-gnu
build_alias =
-build_cpu = x86_64
+build_cpu = i686
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
+host = i686-pc-linux-gnu
host_alias =
-host_cpu = x86_64
+host_cpu = i686
host_os = linux-gnu
-host_vendor = unknown
+host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/vagrant/pdns-2-9-22-x/install-sh
+install_sh = ${SHELL} /home/peter/pdns-2-9-22-x/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/configure
^
|
| @@ -3130,7 +3130,7 @@
# Define the identity of the package.
PACKAGE=pdns
- VERSION=2.9.22.5
+ VERSION=2.9.22.6
cat >>confdefs.h <<_ACEOF
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/configure.in
^
|
| @@ -1,6 +1,6 @@
dnl intro
AC_INIT(pdns/receiver.cc)
-AM_INIT_AUTOMAKE(pdns, 2.9.22.5)
+AM_INIT_AUTOMAKE(pdns, 2.9.22.6)
AC_CANONICAL_HOST
AM_CONFIG_HEADER(config.h)
AC_C_BIGENDIAN
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/debian-pdns/changelog
^
|
| @@ -1,3 +1,9 @@
+pdns (2.9.22.6-1) unstable; urgency=medium
+
+ * fix slave crash
+
+ -- peter van dijk <peter.van.dijk@netherlabs.nl> Mon, 16 Jan 2012 08:25:00 +0100
+
pdns (2.9.22.5-1) unstable; urgency=medium
* fill in the blanks
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/debian-pdns/files
^
|
| @@ -1 +1 @@
-pdns-static_2.9.22.5-1_amd64.deb net extra
+pdns-static_2.9.22.6-1_i386.deb net extra
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns.spec
^
|
| @@ -1,6 +1,6 @@
BuildRoot: /tmp/pdns
Name: pdns-static
-Version: 2.9.22.5
+Version: 2.9.22.6
Release: 1
Summary: extremely powerful and versatile nameserver
License: GPL
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/common_startup.cc
^
|
| @@ -245,12 +245,9 @@
numreceived4++;
else
numreceived6++;
-
-
if(P->d.qr)
continue;
-
-
+
S.ringAccount("queries", P->qdomain+"/"+P->qtype.getName());
S.ringAccount("remotes",P->getRemote());
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/dnsbackend.hh
^
|
| @@ -42,6 +42,7 @@
class DNSBackend;
struct DomainInfo
{
+ DomainInfo() : backend(0) {}
uint32_t id;
string zone;
vector<string> masters;
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/docs/gslb-operations.sgml
^
|
| @@ -6,7 +6,7 @@
<title>The case for PowerDNS</title>
<author>PowerDNS BV (bert hubert <bert@trilab.com>) &nl;
Trilab BV</author>
-<date>v1.0 $Date: 2002-11-27 16:18:23 +0100 (Wed, 27 Nov 2002) $</date>
+<date>v1.0 $Date: 2002-11-27 07:18:23 -0800 (Wed, 27 Nov 2002) $</date>
<abstract>
This document describes what Global Server Load Balancing is, and how
PowerDNS can be employed in a GSLB configuration
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/docs/pdns.sgml
^
|
| @@ -11,7 +11,7 @@
</affiliation>
</author>
- <PubDate>v2.9.19 $Date: 2008-11-30 00:05:00 +0100 (Sun, 30 Nov 2008) $</PubDate>
+ <PubDate>v2.9.19 $Date: 2008-11-29 15:05:00 -0800 (Sat, 29 Nov 2008) $</PubDate>
<Abstract>
<para>
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/docs/powerdns-case.sgml
^
|
| @@ -6,7 +6,7 @@
<title>The case for PowerDNS</title>
<author>PowerDNS BV (bert hubert <bert@trilab.com>) &nl;
Trilab BV</author>
-<date>v1.0 $Date: 2002-11-27 16:18:23 +0100 (Wed, 27 Nov 2002) $</date>
+<date>v1.0 $Date: 2002-11-27 07:18:23 -0800 (Wed, 27 Nov 2002) $</date>
<abstract>
This document describes what PowerDNS is, how it works and how it can be
maintained and operated.
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/docs/powerdns-install.sgml
^
|
| @@ -6,7 +6,7 @@
<title>PowerDNS 1.2 Install & Usage guide
<author>PowerDNS BV
Trilab BV
-<date>v1.1 $Date: 2002-11-27 16:18:23 +0100 (Wed, 27 Nov 2002) $
+<date>v1.1 $Date: 2002-11-27 07:18:23 -0800 (Wed, 27 Nov 2002) $
<abstract>
This document provides information on how to install PowerDNS and on how
to maintain it afterwards
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/docs/powerdns-overview.sgml
^
|
| @@ -6,7 +6,7 @@
<title>PowerDNS Overview</title>
<author>PowerDNS BV (bert hubert <bert@trilab.com>) &nl;
Trilab BV</author>
-<date>v1.0 $Date: 2002-11-27 16:18:23 +0100 (Wed, 27 Nov 2002) $</date>
+<date>v1.0 $Date: 2002-11-27 07:18:23 -0800 (Wed, 27 Nov 2002) $</date>
<abstract>
This document describes what PowerDNS is and what it is for
</abstract>
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/docs/powerdns-technical.sgml
^
|
| @@ -6,7 +6,7 @@
<title>PowerDNS technical overview</title>
<author>PowerDNS BV (bert hubert <bert@trilab.com>) &nl;
Trilab BV</author>
-<date>v1.1 $Date: 2002-11-27 16:18:23 +0100 (Wed, 27 Nov 2002) $</date>
+<date>v1.1 $Date: 2002-11-27 07:18:23 -0800 (Wed, 27 Nov 2002) $</date>
<abstract>
This document contains a technical description of PowerDNS.
</abstract>
|
|
[-]
[+]
|
Changed |
pdns-2.9.22.6.tar.bz2/pdns/slavecommunicator.cc
^
|
| @@ -60,7 +60,7 @@
{
L<<Logger::Error<<"Initiating transfer of '"<<domain<<"' from remote '"<<remote<<"'"<<endl;
uint32_t domain_id;
- PacketHandler P;
+ PacketHandler P; // fresh UeberBackend
DomainInfo di;
di.backend=0;
@@ -71,7 +71,7 @@
UeberBackend *B=dynamic_cast<UeberBackend *>(P.getBackend());
- if(!B->getDomainInfo(domain, di) || !di.backend) {
+ if(!B->getDomainInfo(domain, di) || !di.backend) { // di.backend and B are mostly identical
L<<Logger::Error<<"Can't determine backend for domain '"<<domain<<"'"<<endl;
return;
}
@@ -164,7 +164,9 @@
void CommunicatorClass::addSlaveCheckRequest(const DomainInfo& di, const ComboAddress& remote)
{
Lock l(&d_lock);
- d_tocheck.insert(di);
+ DomainInfo ours = di;
+ ours.backend = 0;
+ d_tocheck.insert(ours);
d_any_sem.post(); // kick the loop!
}
@@ -241,6 +243,8 @@
BOOST_FOREACH(DomainInfo& di, sdomains) {
if(!ssr.d_serials.count(di.id))
continue;
+ if(!di.backend) // might've come from the packethandler
+ B->getDomainInfo(di.zone, di);
uint32_t theirserial = ssr.d_serials[di.id], ourserial = di.serial;
if(theirserial < ourserial) {
|
