|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: Makefile.in
|
|
|
|
|
--- Makefile.in.orig 2009-04-03 13:56:43 +0200
|
|
|
|
|
+++ Makefile.in 2009-05-18 22:45:29 +0200
|
|
|
|
|
--- Makefile.in.orig 2010-04-01 11:46:31.000000000 +0200
|
|
|
|
|
+++ Makefile.in 2010-08-02 19:01:41.000000000 +0200
|
|
|
|
|
@@ -316,13 +316,13 @@
|
|
|
|
|
$(EDIT) $(srcdir)/nsd.conf.sample.in > nsd.conf.sample
|
|
|
|
|
|
|
|
|
|
@ -23,9 +23,9 @@ Index: Makefile.in
|
|
|
|
|
$(INSTALL) zonec $(DESTDIR)$(sbindir)/zonec
|
|
|
|
|
$(INSTALL) nsdc.sh $(DESTDIR)$(sbindir)/nsdc
|
|
|
|
|
Index: tsig.c
|
|
|
|
|
--- tsig.c.orig 2009-01-13 13:45:11 +0100
|
|
|
|
|
+++ tsig.c 2009-05-18 20:09:22 +0200
|
|
|
|
|
@@ -310,11 +310,19 @@
|
|
|
|
|
--- tsig.c.orig 2010-06-17 12:38:03.000000000 +0200
|
|
|
|
|
+++ tsig.c 2010-08-02 19:01:41.000000000 +0200
|
|
|
|
|
@@ -340,11 +340,19 @@
|
|
|
|
|
time_t clock;
|
|
|
|
|
|
|
|
|
|
clock = (time_t) current_time;
|
|
|
|
|
@ -45,3 +45,58 @@ Index: tsig.c
|
|
|
|
|
signed_time_text[24] = '\0';
|
|
|
|
|
|
|
|
|
|
log_msg(LOG_ERR,
|
|
|
|
|
Index: util.c
|
|
|
|
|
--- util.c.orig 2010-06-07 12:52:30.000000000 +0200
|
|
|
|
|
+++ util.c 2010-08-02 19:03:57.000000000 +0200
|
|
|
|
|
@@ -742,7 +742,7 @@
|
|
|
|
|
http://www.tsfr.org/~orc/Code/bsd/bsd-current/cksum/crc.c.
|
|
|
|
|
or http://gobsd.com/code/freebsd/usr.bin/cksum/crc.c
|
|
|
|
|
The polynomial is 0x04c11db7L. */
|
|
|
|
|
-static u_long crctab[] = {
|
|
|
|
|
+static unsigned long crctab[] = {
|
|
|
|
|
0x0,
|
|
|
|
|
0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
|
|
|
|
|
0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
|
|
|
|
|
Index: xfrd-tcp.c
|
|
|
|
|
--- xfrd-tcp.c.orig 2010-06-17 12:38:03.000000000 +0200
|
|
|
|
|
+++ xfrd-tcp.c 2010-08-02 19:22:50.000000000 +0200
|
|
|
|
|
@@ -13,6 +13,8 @@
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
+#include <sys/types.h>
|
|
|
|
|
+#include <sys/socket.h>
|
|
|
|
|
#include "xfrd-tcp.h"
|
|
|
|
|
#include "buffer.h"
|
|
|
|
|
#include "packet.h"
|
|
|
|
|
@@ -22,6 +24,13 @@
|
|
|
|
|
#include "xfrd.h"
|
|
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
|
|
+#ifndef PF_INET
|
|
|
|
|
+#define PF_INET AF_INET
|
|
|
|
|
+#endif
|
|
|
|
|
+#ifndef PF_INET6
|
|
|
|
|
+#define PF_INET6 AF_INET6
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
xfrd_tcp_set_t* xfrd_tcp_set_create(struct region* region)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
Index: xfrd.c
|
|
|
|
|
--- xfrd.c.orig 2010-07-06 16:37:45.000000000 +0200
|
|
|
|
|
+++ xfrd.c 2010-08-02 19:23:01.000000000 +0200
|
|
|
|
|
@@ -26,6 +26,13 @@
|
|
|
|
|
#include "difffile.h"
|
|
|
|
|
#include "ipc.h"
|
|
|
|
|
|
|
|
|
|
+#ifndef PF_INET
|
|
|
|
|
+#define PF_INET AF_INET
|
|
|
|
|
+#endif
|
|
|
|
|
+#ifndef PF_INET6
|
|
|
|
|
+#define PF_INET6 AF_INET6
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
#define XFRD_TRANSFER_TIMEOUT_START 10 /* empty zone timeout is between x and 2*x seconds */
|
|
|
|
|
#define XFRD_TRANSFER_TIMEOUT_MAX 14400 /* empty zone timeout max expbackoff */
|
|
|
|
|
#define XFRD_UDP_TIMEOUT 10 /* seconds, before a udp request times out */
|
|
|
|
|
|
