From suresh@frodo.hserus.net Sun Apr 9 12:40:29 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0072216A403 for ; Sun, 9 Apr 2006 12:40:28 +0000 (UTC) (envelope-from suresh@frodo.hserus.net) Received: from frodo.hserus.net (frodo.hserus.net [204.74.68.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17B2043D5A for ; Sun, 9 Apr 2006 12:40:28 +0000 (GMT) (envelope-from suresh@frodo.hserus.net) Received: from suresh by frodo.hserus.net with local (Exim 4.60 #0) id 1FSZDO-000ILD-RK by authid for ; Sun, 09 Apr 2006 18:10:26 +0530 Message-Id: Date: Sun, 09 Apr 2006 18:10:26 +0530 From: Suresh Ramasubramanian Reply-To: Suresh Ramasubramanian To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: /usr/ports/net/djbdns WITH_IPV6 queries ip6.int X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 95541 >Category: ports >Synopsis: dns/djbdns WITH_IPV6 queries ip6.int >Confidential: no >Severity: serious >Priority: medium >Responsible: roam >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Apr 09 12:50:16 GMT 2006 >Closed-Date: Sun Feb 13 04:20:33 UTC 2011 >Last-Modified: Sun Feb 13 04:20:33 UTC 2011 >Originator: Suresh Ramasubramanian >Release: FreeBSD 4.11-STABLE i386 >Organization: hserus.net >Environment: System: FreeBSD frodo.hserus.net 4.11-STABLE FreeBSD 4.11-STABLE #0: Thu Feb 10 15:48:08 IST 2005 suresh@frodo.hserus.net:/usr/obj/usr/src/sys/FRODO i386 >Description: The freebsd port dns/djbdns has a WITH_IPV6 knob that applies Felix Leitner's v6 patch, version test 14. Later versions of the patch dont seem to work on bsd - some issue with their accepting datagrams, per the history of this port. However test14 queries the soon to be deprecated ip6.int for ipv6 - http://www.arin.net/announcements/20060406.html. The current version test23 at http://www.fefe.de/dns/djbdns-1.05-test23.diff.bz2 does seem to have support for ip6.arpa, and both now set IPV6_V6ONLY instead of EPROTO for BSD The port could do with an update if possible, at least to update test14 to query ip6.arpa instead of ip6.int. Also there's a related patch for ucspi-tcp at http://www.fefe.de/ucspi/ thanks -suresh >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->roam Responsible-Changed-By: anray Responsible-Changed-When: Thu Apr 13 10:06:38 UTC 2006 Responsible-Changed-Why: Over to maintainer. http://www.freebsd.org/cgi/query-pr.cgi?pr=95541 From: Suresh Ramasubramanian To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/95541: /usr/ports/net/djbdns WITH_IPV6 queries ip6.int Date: Fri, 29 Sep 2006 12:39:03 +0530 This is a multi-part message in MIME format. --------------060007040206070308030701 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit *bump* any update, folks? --------------060007040206070308030701 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit *bump*
any update, folks?
--------------060007040206070308030701-- Responsible-Changed-From-To: roam->freebsd-ports-bugs Responsible-Changed-By: edwin Responsible-Changed-When: Mon Sep 10 01:37:30 UTC 2007 Responsible-Changed-Why: Maintainer was reset http://www.freebsd.org/cgi/query-pr.cgi?pr=95541 Responsible-Changed-From-To: freebsd-ports-bugs->garga Responsible-Changed-By: garga Responsible-Changed-When: Mon Sep 10 20:10:33 UTC 2007 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=95541 Responsible-Changed-From-To: garga->roam Responsible-Changed-By: garga Responsible-Changed-When: Tue Sep 11 11:29:59 UTC 2007 Responsible-Changed-Why: Maintainer was not reset, so, back it to roam http://www.freebsd.org/cgi/query-pr.cgi?pr=95541 From: Renato Botelho To: bug-followup@freebsd.org, suresh@hserus.net Cc: Subject: Re: ports/95541: net/djbdns WITH_IPV6 queries ip6.int Date: Tue, 11 Sep 2007 08:35:15 -0300 I took the PR because it was accidentally back to the pool. Anyway, i made ome work on this, and here is my job. I made a patch to apply ipv6 and ignoreip together, and made some changes on the port to pet portlint. I planned to host the patch on my area on MASTER_SITE_LOCAL, but i'm sending it here and you can change the location. Since i coundn't find any slave port, i removed some ?=. Here is the patch to ipv6 and ignoreip: ------------------------------- starts here ------------------------------- diff -ruN djbdns-1.05.ORIG/dnscache.c djbdns-1.05/dnscache.c --- djbdns-1.05.ORIG/dnscache.c 2007-09-10 16:53:09.000000000 -0300 +++ djbdns-1.05/dnscache.c 2007-09-10 16:53:55.000000000 -0300 @@ -23,7 +23,6 @@ #include "okclient.h" #include "droproot.h" -stralloc ignoreip = {0}; static int packetquery(char *buf,unsigned int len,char **q,char qtype[2],char qclass[2],char id[2]) { @@ -391,7 +390,6 @@ int main() { char *x; - unsigned int i, j, k; unsigned long cachesize; x = env_get("IP"); diff -ruN djbdns-1.05.ORIG/query.c djbdns-1.05/query.c --- djbdns-1.05.ORIG/query.c 2007-09-10 16:53:09.000000000 -0300 +++ djbdns-1.05/query.c 2007-09-10 16:53:40.000000000 -0300 @@ -195,7 +195,6 @@ int k; int p; int q; - unsigned int ii; errno = error_io; if (state == 1) goto HAVEPACKET; @@ -646,9 +645,6 @@ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE; if (byte_equal(header + 8,2,"\0\4")) { pos = dns_packet_copy(buf,len,pos,header,4); if (!pos) goto DIE; - if (ignoreip.len) - for(ii = 0; ii < ignoreip.len; ii+= 4) - if (byte_equal(header,4,ignoreip.s+ii)) goto NXDOMAIN; save_data(header,4); log_rr(whichserver,t1,DNS_T_A,header,4,ttl); } -------------------------------- ends here -------------------------------- And here is the new patch against the port ------------------------------- starts here ------------------------------- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/dns/djbdns/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- Makefile 23 Sep 2006 15:31:43 -0000 1.29 +++ Makefile 11 Sep 2007 11:28:05 -0000 @@ -5,33 +5,47 @@ # $FreeBSD: ports/dns/djbdns/Makefile,v 1.29 2006/09/23 15:31:43 roam Exp $ # -PORTNAME?= djbdns -PORTVERSION?= ${DJBDNS_VER} -PORTREVISION?= 10 -CATEGORIES?= dns +PORTNAME= djbdns +PORTVERSION= ${DJBDNS_VER} +PORTREVISION= 10 +CATEGORIES= dns MASTER_SITES= http://cr.yp.to/djbdns/ \ ftp://cr.yp.to/djbdns/ DISTNAME= djbdns-${DJBDNS_VER} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +PATCH_DIST_STRIP= -p1 + +MAINTAINER= roam@FreeBSD.org +COMMENT= A collection of secure and reliable DNS tools + +RUN_DEPENDS= setuidgid:${PORTSDIR}/sysutils/daemontools \ + tcpserver:${PORTSDIR}/sysutils/ucspi-tcp OPTIONS= DUMPCACHE 'persistent cache for dnscache' off \ IPV6 'IPv6 support by Felix von Leitner' off \ - IGNOREIP 'ignoreip2 patch by Russell Nelson' off \ - JUMBO 'jumbo patch by Claudiu Costin' off \ + IGNOREIP 'ignoreip2 by Russell Nelson' off \ + JUMBO 'jumbo by Claudiu Costin' off \ MAN 'manual pages by Gerritt Pape' on \ - PERSISTENT_MMAP 'persistent mmap patch by Lennert Buytenhek' off \ - SRV 'SRV record patch by Michael Handler' off + PERSISTENT_MMAP 'persistent mmap by Lennert Buytenhek' off \ + SRV 'SRV record by Michael Handler' off + +DJBDNS_VER= 1.05 +DJBDNS_V6_VER= test23 + +ALL_TARGET= it +INSTALL_TARGET= setup check + +RESTRICTED= Forbidden to redistribute - we have patches to the distribution. .include .if defined(WITH_JUMBO) .if defined(WITH_IPV6) || defined(WITH_IGNOREIP) || defined(WITH_SRV) -BROKEN= "The jumbo patch currently conflicts with the IPv6 and ignoreip2 patches" +BROKEN= The jumbo patch currently conflicts with the IPv6 and ignoreip2 patches .endif PATCH_SITES+= http://www.ro.kde.org/djbdns/mywork/jumbo/:jumbo PATCHFILES+= jumbo-p13.patch.gz:jumbo -PATCH_DIST_STRIP= -p1 .if defined(WITH_DUMPCACHE) CFLAGS+= -DDUMPCACHE .endif @@ -52,61 +66,46 @@ MANCOMPRESSED= no .endif +.if defined(WITH_IGNOREIP) +PATCH_SITES+= http://tinydns.org/:ignoreip +PATCHFILES+= djbdns-1.05-ignoreip2.patch:ignoreip +.endif + .if defined(WITH_IPV6) +.if defined(WITH_IGNOREIP) +PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:ipv6_ignoreip/} +PATCHFILES+= djbdns_ipv6_ignoreip2.patch:ipv6_ignoreip +PATCH_SITE_SUBDIR+= garga/djbdns/:ipv6_ignoreip +.endif + PKGNAMESUFFIX= -ipv6 PORTVERSION= ${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//} PATCH_SITES+= http://www.fefe.de/dns/:ipv6 PATCHFILES+= ${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2:ipv6 -PATCH_DIST_STRIP= -p1 EXTRA_PATCHES+= ${FILESDIR}/uint32.patch + +PLIST_SUB+= WITH_IPV6="" +.else +PLIST_SUB+= WITH_IPV6="@comment " .endif .if defined(WITH_DUMPCACHE) && !defined(WITH_JUMBO) .if defined(WITH_IPV6) -BROKEN= "The IPv6 and dnscache-dumpcache patches are currently in conflict" +BROKEN= The IPv6 and dnscache-dumpcache patches are currently in conflict .endif PATCH_SITES+= http://efge.free.fr/djbdns/:dumpcache PATCHFILES+= patch-dnscache-dumpcache-v4.txt:dumpcache -PATCH_DIST_STRIP= -p1 CFLAGS+= -DDUMPCACHE .endif -.if defined(WITH_IGNOREIP) -PATCH_SITES+= http://tinydns.org/:ignoreip -PATCHFILES+= djbdns-1.05-ignoreip2.patch:ignoreip -PATCH_DIST_STRIP= -p1 -.endif - .if defined(WITH_PERSISTENT_MMAP) PATCH_SITES+= http://people.FreeBSD.org/~roam/ports/patches/dns/:persistent PATCHFILES+= tinydns-persistmmap-20040418.patch:persistent -PATCH_DIST_STRIP= -p1 .endif .if defined(WITH_SRV) PATCH_SITES+= http://tinydns.org/:srv PATCHFILES+= srv-patch:srv -PATCH_DIST_STRIP= -p1 -.endif - -DJBDNS_VER= 1.05 -DJBDNS_V6_VER= test14 - -MAINTAINER?= roam@FreeBSD.org -COMMENT?= A collection of secure and reliable DNS tools - -RUN_DEPENDS= setuidgid:${PORTSDIR}/sysutils/daemontools \ - tcpserver:${PORTSDIR}/sysutils/ucspi-tcp - -ALL_TARGET= it -INSTALL_TARGET= setup check - -RESTRICTED= Forbidden to redistribute - we have patches to the distribution. - -.if defined(WITH_IPV6) -PLIST_SUB+= WITH_IPV6="" -.else -PLIST_SUB+= WITH_IPV6="@comment " .endif post-patch: Index: distinfo =================================================================== RCS file: /home/pcvs/ports/dns/djbdns/distinfo,v retrieving revision 1.17 diff -u -r1.17 distinfo --- distinfo 23 Sep 2006 15:31:43 -0000 1.17 +++ distinfo 11 Sep 2007 11:28:05 -0000 @@ -10,9 +10,9 @@ MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542 SHA256 (patch-dnscache-dumpcache-v4.txt) = c2fbc21035fccbb3564226fc40edaa44643119b7b103483825f82786c89009f0 SIZE (patch-dnscache-dumpcache-v4.txt) = 16065 -MD5 (djbdns-1.05-test14.diff.bz2) = 52bec93d7ce6226281082367e49157d3 -SHA256 (djbdns-1.05-test14.diff.bz2) = 354702f051674ddb20d9f593932843b12cbaa7738b1318767e66f19c68a6ca24 -SIZE (djbdns-1.05-test14.diff.bz2) = 15915 +MD5 (djbdns-1.05-test23.diff.bz2) = dc35e88e20ffe2670cef5bb4d8a2c183 +SHA256 (djbdns-1.05-test23.diff.bz2) = e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33 +SIZE (djbdns-1.05-test23.diff.bz2) = 18480 MD5 (djbdns-1.05-ignoreip2.patch) = c032250b209d055847a763c8d9c7e865 SHA256 (djbdns-1.05-ignoreip2.patch) = ca5d759380c316132be6680e77c37d24a5d715cd6e1c325a75c8450e01133be0 SIZE (djbdns-1.05-ignoreip2.patch) = 3890 @@ -22,3 +22,6 @@ MD5 (srv-patch) = df1578c70d52809184a417556f0fce39 SHA256 (srv-patch) = 779546218b09544493c6ba5e23bc29c33c5d284cfc78ac6fa74fa8e050bb3779 SIZE (srv-patch) = 4508 +MD5 (djbdns_ipv6_ignoreip2.patch) = 0f9e26b3b64b5a3e8e53247ef1a0689c +SHA256 (djbdns_ipv6_ignoreip2.patch) = 016c28ed07d74d073a1433ac773b6e78815b59d2d14d8f8b0b10972e7bbd8c44 +SIZE (djbdns_ipv6_ignoreip2.patch) = 1278 -------------------------------- ends here -------------------------------- Thanks -- Renato Botelho GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc Code rot -- mostly caused by people redefining "fresh". -- Wes Peters From: Edwin Groothuis To: FreeBSD Gnats Submit Cc: Subject: Re: ports/95541: net/djbdns WITH_IPV6 queries ip6.int Date: Mon, 26 May 2008 17:52:38 +1000 New patch, but it doesn't apply properly on the query.c patch of garga@: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/dns/djbdns/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- Makefile 24 May 2008 03:19:29 -0000 1.33 +++ Makefile 26 May 2008 07:51:15 -0000 @@ -5,39 +5,45 @@ # $FreeBSD: ports/dns/djbdns/Makefile,v 1.33 2008/05/24 03:19:29 edwin Exp $ # -PORTNAME?= djbdns -PORTVERSION?= ${DJBDNS_VER} -PORTREVISION?= 12 -CATEGORIES?= dns +PORTNAME= djbdns +PORTVERSION= ${DJBDNS_VER} +PORTREVISION= 12 +CATEGORIES= dns MASTER_SITES= http://cr.yp.to/djbdns/ \ ftp://cr.yp.to/djbdns/ DISTNAME= djbdns-${DJBDNS_VER} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +PATCH_DIST_STRIP= -p1 -MAINTAINER?= roam@FreeBSD.org -COMMENT?= A collection of secure and reliable DNS tools +MAINTAINER= roam@FreeBSD.org +COMMENT= A collection of secure and reliable DNS tools RUN_DEPENDS= setuidgid:${PORTSDIR}/sysutils/daemontools \ tcpserver:${PORTSDIR}/sysutils/ucspi-tcp OPTIONS= DUMPCACHE "persistent cache for dnscache" off \ IPV6 "IPv6 support by Felix von Leitner" off \ - IGNOREIP "ignoreip2 patch by Russell Nelson" off \ - JUMBO "jumbo patch by Claudiu Costin" off \ + IGNOREIP "ignoreip2 by Russell Nelson" off \ + JUMBO "jumbo by Claudiu Costin" off \ MAN "manual pages by Gerritt Pape" on \ - PERSISTENT_MMAP "persistent mmap patch by Lennert Buytenhek" off \ - SRV "SRV record patch by Michael Handler" off + PERSISTENT_MMAP "persistent mmap by Lennert Buytenhek" off \ + SRV "SRV record by Michael Handler" off + +DJBDNS_VER= 1.05 +DJBDNS_V6_VER= test23 + +ALL_TARGET= it +INSTALL_TARGET= setup check .include .if defined(WITH_JUMBO) .if defined(WITH_IPV6) || defined(WITH_IGNOREIP) || defined(WITH_SRV) -BROKEN= "The jumbo patch currently conflicts with the IPv6 and ignoreip2 patches" +BROKEN= The jumbo patch currently conflicts with the IPv6 and ignoreip2 patches .endif PATCH_SITES+= http://www.ro.kde.org/djbdns/mywork/jumbo/:jumbo PATCHFILES+= jumbo-p13.patch.gz:jumbo -PATCH_DIST_STRIP= -p1 .if defined(WITH_DUMPCACHE) CFLAGS+= -DDUMPCACHE .endif @@ -58,13 +64,27 @@ MANCOMPRESSED= no .endif +.if defined(WITH_IGNOREIP) +PATCH_SITES+= http://tinydns.org/:ignoreip +PATCHFILES+= djbdns-1.05-ignoreip2.patch:ignoreip +.endif + .if defined(WITH_IPV6) +.if defined(WITH_IGNOREIP) +PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:ipv6_ignoreip/} +PATCHFILES+= djbdns_ipv6_ignoreip2.patch:ipv6_ignoreip +PATCH_SITE_SUBDIR+= garga/djbdns/:ipv6_ignoreip +.endif + PKGNAMESUFFIX= -ipv6 PORTVERSION= ${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//} PATCH_SITES+= http://www.fefe.de/dns/:ipv6 PATCHFILES+= ${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2:ipv6 -PATCH_DIST_STRIP= -p1 EXTRA_PATCHES+= ${FILESDIR}/uint32.patch + +PLIST_SUB+= WITH_IPV6="" +.else +PLIST_SUB+= WITH_IPV6="@comment " .endif .if defined(WITH_DUMPCACHE) && !defined(WITH_JUMBO) @@ -73,38 +93,22 @@ .endif PATCH_SITES+= http://efge.free.fr/djbdns/:dumpcache PATCHFILES+= patch-dnscache-dumpcache-v4.txt:dumpcache -PATCH_DIST_STRIP= -p1 CFLAGS+= -DDUMPCACHE .endif .if defined(WITH_IGNOREIP) PATCH_SITES+= http://tinydns.org/:ignoreip PATCHFILES+= djbdns-1.05-ignoreip2.patch:ignoreip -PATCH_DIST_STRIP= -p1 .endif .if defined(WITH_PERSISTENT_MMAP) PATCH_SITES+= http://people.FreeBSD.org/~roam/ports/patches/dns/:persistent PATCHFILES+= tinydns-persistmmap-20040418.patch:persistent -PATCH_DIST_STRIP= -p1 .endif .if defined(WITH_SRV) PATCH_SITES+= http://tinydns.org/:srv PATCHFILES+= srv-patch:srv -PATCH_DIST_STRIP= -p1 -.endif - -DJBDNS_VER= 1.05 -DJBDNS_V6_VER= test14 - -ALL_TARGET= it -INSTALL_TARGET= setup check - -.if defined(WITH_IPV6) -PLIST_SUB+= WITH_IPV6="" -.else -PLIST_SUB+= WITH_IPV6="@comment " .endif post-patch: Index: distinfo =================================================================== RCS file: /home/pcvs/ports/dns/djbdns/distinfo,v retrieving revision 1.17 diff -u -r1.17 distinfo --- distinfo 23 Sep 2006 15:31:43 -0000 1.17 +++ distinfo 26 May 2008 07:51:15 -0000 @@ -10,9 +10,9 @@ MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542 SHA256 (patch-dnscache-dumpcache-v4.txt) = c2fbc21035fccbb3564226fc40edaa44643119b7b103483825f82786c89009f0 SIZE (patch-dnscache-dumpcache-v4.txt) = 16065 -MD5 (djbdns-1.05-test14.diff.bz2) = 52bec93d7ce6226281082367e49157d3 -SHA256 (djbdns-1.05-test14.diff.bz2) = 354702f051674ddb20d9f593932843b12cbaa7738b1318767e66f19c68a6ca24 -SIZE (djbdns-1.05-test14.diff.bz2) = 15915 +MD5 (djbdns-1.05-test23.diff.bz2) = dc35e88e20ffe2670cef5bb4d8a2c183 +SHA256 (djbdns-1.05-test23.diff.bz2) = e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33 +SIZE (djbdns-1.05-test23.diff.bz2) = 18480 MD5 (djbdns-1.05-ignoreip2.patch) = c032250b209d055847a763c8d9c7e865 SHA256 (djbdns-1.05-ignoreip2.patch) = ca5d759380c316132be6680e77c37d24a5d715cd6e1c325a75c8450e01133be0 SIZE (djbdns-1.05-ignoreip2.patch) = 3890 @@ -22,3 +22,6 @@ MD5 (srv-patch) = df1578c70d52809184a417556f0fce39 SHA256 (srv-patch) = 779546218b09544493c6ba5e23bc29c33c5d284cfc78ac6fa74fa8e050bb3779 SIZE (srv-patch) = 4508 +MD5 (djbdns_ipv6_ignoreip2.patch) = 0f9e26b3b64b5a3e8e53247ef1a0689c +SHA256 (djbdns_ipv6_ignoreip2.patch) = 016c28ed07d74d073a1433ac773b6e78815b59d2d14d8f8b0b10972e7bbd8c44 +SIZE (djbdns_ipv6_ignoreip2.patch) = 1278 Index: files/patch-dnscache.c =================================================================== RCS file: files/patch-dnscache.c diff -N files/patch-dnscache.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-dnscache.c 26 May 2008 07:51:15 -0000 @@ -0,0 +1,39 @@ +--- dnscache.c.orig 2007-09-10 16:53:09.000000000 -0300 ++++ dnscache.c 2007-09-10 16:53:55.000000000 -0300 +@@ -23,7 +23,6 @@ + #include "okclient.h" + #include "droproot.h" + +-stralloc ignoreip = {0}; + + static int packetquery(char *buf,unsigned int len,char **q,char qtype[2],char qclass[2],char id[2]) + { +@@ -391,7 +390,6 @@ + int main() + { + char *x; +- unsigned int i, j, k; + unsigned long cachesize; + + x = env_get("IP"); +diff -ruN djbdns-1.05.ORIG/query.c djbdns-1.05/query.c +--- query.c.orig 2007-09-10 16:53:09.000000000 -0300 ++++ query.c 2007-09-10 16:53:40.000000000 -0300 +@@ -195,7 +195,6 @@ + int k; + int p; + int q; +- unsigned int ii; + + errno = error_io; + if (state == 1) goto HAVEPACKET; +@@ -646,9 +645,6 @@ + pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE; + if (byte_equal(header + 8,2,"\0\4")) { + pos = dns_packet_copy(buf,len,pos,header,4); if (!pos) goto DIE; +- if (ignoreip.len) +- for(ii = 0; ii < ignoreip.len; ii+= 4) +- if (byte_equal(header,4,ignoreip.s+ii)) goto NXDOMAIN; + save_data(header,4); + log_rr(whichserver,t1,DNS_T_A,header,4,ttl); + } -- Edwin Groothuis | Personal website: http://www.mavetju.org edwin@mavetju.org | Weblog: http://www.mavetju.org/weblog/ State-Changed-From-To: open->closed State-Changed-By: miwi State-Changed-When: Sun Feb 13 04:20:32 UTC 2011 State-Changed-Why: close here never version was committed. http://www.freebsd.org/cgi/query-pr.cgi?pr=95541 >Unformatted: