From oli@amun.isnic.is  Tue Feb 18 04:24:00 2003
Return-Path: <oli@amun.isnic.is>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D894A37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Feb 2003 04:24:00 -0800 (PST)
Received: from amun.isnic.is (amun.isnic.is [193.4.58.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AB6B843FB1
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Feb 2003 04:23:55 -0800 (PST)
	(envelope-from oli@amun.isnic.is)
Received: from amun.isnic.is (smmsp@localhost [127.0.0.1])
	by amun.isnic.is (8.12.3/8.12.3/isnic) with ESMTP id h1ICNoYj096429;
	Tue, 18 Feb 2003 12:23:50 GMT
	(envelope-from oli@amun.isnic.is)
Received: (from root@localhost)
	by amun.isnic.is (8.12.3/8.12.3/Submit) id h1ICNnuf096428;
	Tue, 18 Feb 2003 12:23:49 GMT
	(envelope-from oli)
Message-Id: <200302181223.h1ICNnuf096428@amun.isnic.is>
Date: Tue, 18 Feb 2003 12:23:49 GMT
From: Olafur Osvaldsson <oli@isnic.is>
Reply-To: Olafur Osvaldsson <oli@isnic.is>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nsd-info@nlnetlabs.nl
Subject: net/nsd: Bug fixes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48421
>Category:       ports
>Synopsis:       net/nsd: Bug fixes
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 18 04:30:08 PST 2003
>Closed-Date:    Fri Apr 11 14:05:31 PDT 2003
>Last-Modified:  Fri Apr 11 14:05:31 PDT 2003
>Originator:     Olafur Osvaldsson
>Release:        FreeBSD 4.6-RELEASE i386
>Organization:
>Environment:
System: FreeBSD amun.isnic.is 4.6-RELEASE FreeBSD 4.6-RELEASE #4: Thu Jun 20 11:21:56 GMT 2002 root@amun.isnic.is:/u0/obj/usr/src/sys/VA1220 i386


	
>Description:
These patches fix bugs in the software and were obtained from the maintainer.

	
>How-To-Repeat:
	
>Fix:

	

--- nsd.patch begins here ---
diff -ruN nsd.orig/Makefile nsd/Makefile
--- nsd.orig/Makefile	Wed Feb 12 22:19:25 2003
+++ nsd/Makefile	Tue Feb 18 12:18:32 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	nsd
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/
 
diff -ruN nsd.orig/files/patch-aa nsd/files/patch-aa
--- nsd.orig/files/patch-aa	Thu Jan  1 00:00:00 1970
+++ nsd/files/patch-aa	Wed Feb 12 13:42:33 2003
@@ -0,0 +1,19 @@
+--- 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);
+ 
+ 
+ 	/* Are we a tcp child? */
+@@ -566,6 +567,8 @@
+ 	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 -ruN nsd.orig/files/patch-ab nsd/files/patch-ab
--- nsd.orig/files/patch-ab	Thu Jan  1 00:00:00 1970
+++ nsd/files/patch-ab	Tue Feb 18 11:01:38 2003
@@ -0,0 +1,20 @@
+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;
--- nsd.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Fri Apr 11 14:05:20 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48421 
>Unformatted:
