head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.6.6.1 OPENPKG_E1_FP:1.6.6.1 OPENPKG_2_STABLE_MP:1.7 OPENPKG_2_STABLE_20061018:1.6.6.1 OPENPKG_2_STABLE_20060622:1.6 OPENPKG_2_STABLE:1.6.0.6 OPENPKG_2_STABLE_BP:1.6 OPENPKG_2_5_RELEASE:1.6 OPENPKG_2_5_SOLID:1.6.0.4 OPENPKG_2_5_SOLID_BP:1.6 OPENPKG_2_4_RELEASE:1.6 OPENPKG_2_4_SOLID:1.6.0.2 OPENPKG_2_4_SOLID_BP:1.6 OPENPKG_CW_FP:1.6 OPENPKG_2_3_RELEASE:1.5.2.1 OPENPKG_2_3_SOLID:1.5.0.2 OPENPKG_2_3_SOLID_BP:1.5 OPENPKG_2_2_RELEASE:1.4 OPENPKG_2_2_SOLID:1.4.0.6 OPENPKG_2_2_SOLID_BP:1.4 OPENPKG_2_1_RELEASE:1.4 OPENPKG_2_1_SOLID:1.4.0.4 OPENPKG_2_1_SOLID_BP:1.4 OPENPKG_2_0_RELEASE:1.4 OPENPKG_2_0_SOLID:1.4.0.2 OPENPKG_2_0_SOLID_BP:1.4; locks; strict; comment @# @; 1.8 date 2009.05.18.20.51.25; author rse; state Exp; branches; next 1.7; commitid 4HasfPI4pwaqDoOt; 1.7 date 2006.09.06.17.33.46; author rse; state Exp; branches; next 1.6; commitid je3DHZGJObDCcNLr; 1.6 date 2005.02.23.15.22.16; author rse; state Exp; branches 1.6.6.1; next 1.5; 1.5 date 2005.01.18.19.02.54; author ms; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2004.02.13.19.44.50; author rse; state Exp; branches; next 1.3; 1.3 date 2003.11.15.19.55.42; author rse; state Exp; branches; next 1.2; 1.2 date 2003.04.16.08.27.08; author rse; state dead; branches; next 1.1; 1.1 date 2003.04.13.18.01.02; author rse; state Exp; branches; next ; 1.6.6.1 date 2006.10.16.14.53.26; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; 1.5.2.1 date 2005.02.23.15.23.02; author rse; state Exp; branches; next ; desc @@ 1.8 log @upgrading package: nsd 3.2.1 -> 3.2.2 @ text @Index: Makefile.in --- Makefile.in.orig 2009-04-03 13:56:43 +0200 +++ Makefile.in 2009-05-18 22:45:29 +0200 @@@@ -316,13 +316,13 @@@@ $(EDIT) $(srcdir)/nsd.conf.sample.in > nsd.conf.sample install: all - $(INSTALL) -d $(DESTDIR)$(sbindir) - $(INSTALL) -d $(DESTDIR)$(configdir) - $(INSTALL) -d $(DESTDIR)$(piddir) - $(INSTALL) -d $(DESTDIR)$(dbdir) - $(INSTALL) -d $(DESTDIR)$(mandir) - $(INSTALL) -d $(DESTDIR)$(mandir)/man8 - $(INSTALL) -d $(DESTDIR)$(mandir)/man5 + -$(INSTALL) -d $(DESTDIR)$(sbindir) + -$(INSTALL) -d $(DESTDIR)$(configdir) + -$(INSTALL) -d $(DESTDIR)$(piddir) + -$(INSTALL) -d $(DESTDIR)$(dbdir) + -$(INSTALL) -d $(DESTDIR)$(mandir) + -$(INSTALL) -d $(DESTDIR)$(mandir)/man8 + -$(INSTALL) -d $(DESTDIR)$(mandir)/man5 $(INSTALL) nsd $(DESTDIR)$(sbindir)/nsd $(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 @@@@ time_t clock; clock = (time_t) current_time; +#ifdef __sun__ + ctime_r(&clock, current_time_text, sizeof(current_time_text)); +#else ctime_r(&clock, current_time_text); +#endif current_time_text[24] = '\0'; clock = (time_t) signed_time; +#ifdef __sun__ + ctime_r(&clock, signed_time_text, sizeof(signed_time_text)); +#else ctime_r(&clock, signed_time_text); +#endif signed_time_text[24] = '\0'; log_msg(LOG_ERR, @ 1.7 log @upgrade to NSD 3.0: AXFR was added, tcpwrapper support is now internal via ACL; make install now supports DESTDIR; fix OSSP fsl macro usage @ text @d1 24 d26 3 a28 3 --- tsig.c.orig 2006-08-31 16:08:15 +0200 +++ tsig.c 2006-09-06 18:52:25 +0200 @@@@ -286,11 +286,19 @@@@ @ 1.6 log @fix building under Solaris @ text @a0 27 Index: axfr.c --- axfr.c.orig 2004-02-04 13:16:47.000000000 +0100 +++ axfr.c 2004-02-13 20:41:00.000000000 +0100 @@@@ -14,7 +14,7 @@@@ #include "packet.h" #ifdef LIBWRAP -#include +#include "tcpd.h" int allow_severity = LOG_INFO; int deny_severity = LOG_NOTICE; @@@@ -166,12 +166,10 @@@@ *t = 0; #endif /* AXFR_DAEMON_PREFIX */ - request_init(&request, RQ_DAEMON, AXFR_DAEMON, RQ_CLIENT_SIN, &q->addr, 0); - sock_methods(&request); /* This is to work around the bug in libwrap */ + request_init(&request, RQ_DAEMON, AXFR_DAEMON, RQ_CLIENT_ADDR, &q->addr, 0); if (!hosts_access(&request)) { #ifdef AXFR_DAEMON_PREFIX - request_init(&request, RQ_DAEMON, axfr_daemon, RQ_CLIENT_SIN, &q->addr, 0); - sock_methods(&request); /* This is to work around the bug in libwrap */ + request_init(&request, RQ_DAEMON, axfr_daemon, RQ_CLIENT_ADDR, &q->addr, 0); log_msg(LOG_ERR, "checking %s", axfr_daemon); if (!hosts_access(&request)) { #endif /* AXFR_DAEMON_PREFIX */ d2 3 a4 3 --- tsig.c.orig 2005-01-17 16:35:54.000000000 +0100 +++ tsig.c 2005-02-23 16:19:36.487025139 +0100 @@@@ -249,11 +249,19 @@@@ d23 1 a23 1 #if 0 /* XXX */ @ 1.6.6.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @d1 27 d29 3 a31 3 --- tsig.c.orig 2006-08-31 16:08:15 +0200 +++ tsig.c 2006-09-06 18:52:25 +0200 @@@@ -286,11 +286,19 @@@@ d50 1 a50 1 log_msg(LOG_ERR, @ 1.5 log @upgrading package: nsd 2.1.5 -> 2.2.0 @ text @d28 23 @ 1.5.2.1 log @MFC: fix building under Solaris @ text @a27 23 Index: tsig.c --- tsig.c.orig 2005-01-17 16:35:54.000000000 +0100 +++ tsig.c 2005-02-23 16:19:36.487025139 +0100 @@@@ -249,11 +249,19 @@@@ time_t clock; clock = (time_t) current_time; +#ifdef __sun__ + ctime_r(&clock, current_time_text, sizeof(current_time_text)); +#else ctime_r(&clock, current_time_text); +#endif current_time_text[24] = '\0'; clock = (time_t) signed_time; +#ifdef __sun__ + ctime_r(&clock, signed_time_text, sizeof(signed_time_text)); +#else ctime_r(&clock, signed_time_text); +#endif signed_time_text[24] = '\0'; #if 0 /* XXX */ @ 1.4 log @upgrading package: nsd 1.2.4 -> 2.0.0 @ text @d4 3 a6 3 @@@@ -44,7 +44,7 @@@@ #include "query.h" d13 1 a13 1 @@@@ -190,12 +190,10 @@@@ @ 1.3 log @upgrading package: nsd 1.2.2 -> 1.2.3 @ text @d1 5 a5 5 Index: query.c --- query.c.orig 2003-11-15 13:46:00.000000000 +0100 +++ query.c 2003-11-15 20:54:38.000000000 +0100 @@@@ -64,7 +64,7 @@@@ #include "util.h" d13 1 a13 1 @@@@ -704,12 +704,10 @@@@ d20 1 a20 1 if(!hosts_access(&request)) { d26 1 a26 1 if(!hosts_access(&request)) { @ 1.2 log @upgrading package: nsd 1.0.2 -> 1.1.0b @ text @d1 5 a5 7 --- nsd.c 17 Dec 2002 14:42:06 -0000 1.56.2.10 +++ nsd.c 12 Feb 2003 09:19:50 -0000 @@@@ -159,6 +159,7 @@@@ signal(SIGINT, &sig_handler); signal(SIGILL, &sig_handler); signal(SIGALRM, &sig_handler); + signal(SIGPIPE, SIG_IGN); d7 3 d11 17 a27 29 /* Are we a tcp child? */ @@@@ -566,6 +567,7 @@@@ signal(SIGINT, &sig_handler); signal(SIGILL, &sig_handler); signal(SIGALRM, &sig_handler); + signal(SIGPIPE, SIG_IGN); /* Get our process id */ nsd.pid[0] = getpid(); diff -u -r1.83 query.c --- query.c 14 Oct 2002 13:12:16 -0000 1.83 +++ query.c 18 Feb 2003 10:46:11 -0000 @@@@ -145,11 +145,13 @@@@ /* Truncate */ if(d && DOMAIN_FLAGS(d) & NAMEDB_DELEGATION) { - ANCOUNT(q) = NSCOUNT(q); + ANCOUNT(q) = htons(ntohs(NSCOUNT(q)) + ntohs(ARCOUNT(q))); + } else { + q->iobufptr = qptr + ANSWER_RRS(a, ntohs(ANCOUNT(q))); } - NSCOUNT(q) = 0; + ARCOUNT(q) = 0; - q->iobufptr = qptr + ANSWER_RRS(a, ntohs(ANCOUNT(q))); + NSCOUNT(q) = 0; /* More data... */ return 1; @ 1.1 log @add bugfixing patch from FreeBSD @ text @@