From owner-svn-ports-head@freebsd.org  Fri Mar 17 02:14:40 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E0F7D0F364;
 Fri, 17 Mar 2017 02:14:40 +0000 (UTC)
 (envelope-from junovitch@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D65F1794;
 Fri, 17 Mar 2017 02:14:40 +0000 (UTC)
 (envelope-from junovitch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2H2EdmU069368;
 Fri, 17 Mar 2017 02:14:39 GMT (envelope-from junovitch@FreeBSD.org)
Received: (from junovitch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2H2EdNo069367;
 Fri, 17 Mar 2017 02:14:39 GMT (envelope-from junovitch@FreeBSD.org)
Message-Id: <201703170214.v2H2EdNo069367@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: junovitch set sender to
 junovitch@FreeBSD.org using -f
From: Jason Unovitch <junovitch@FreeBSD.org>
Date: Fri, 17 Mar 2017 02:14:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r436315 - head/dns/nsd/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Mar 2017 02:14:40 -0000

Author: junovitch
Date: Fri Mar 17 02:14:39 2017
New Revision: 436315
URL: https://svnweb.freebsd.org/changeset/ports/436315

Log:
  dns/nsd: Fix missing _t to _type conversion for disable-radix-tree option
  
  - Noting NSD changelog, recent update renamed _t typedefs because POSIX
    reserves them. The 4.1.15 update missed a few conversion.
  - Unbreak RADIXTREE. No PORTREVISION change as port would not have built.
  
  PR:		217640
  Reported by:	Max Kostikov <max@kostikov.co>
  Submitted by:	w.schwarzenfeld@utanet.at (the suggested diff)
  		jaap@NLnetLabs.nl (maintainer - the port patch)
  Obtained from:	nsd svn r4741

Added:
  head/dns/nsd/files/patch-query.c   (contents, props changed)

Added: head/dns/nsd/files/patch-query.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/nsd/files/patch-query.c	Fri Mar 17 02:14:39 2017	(r436315)
@@ -0,0 +1,20 @@
+--- query.c.orig	2017-03-09 14:53:32 UTC
++++ query.c
+@@ -664,7 +664,7 @@ add_additional_rrsets(struct query *quer
+ 			temp->rnode = NULL;
+ 			temp->dname = additional->dname;
+ #else
+-			memcpy(&temp->node, &additional->node, sizeof(rbnode_t));
++			memcpy(&temp->node, &additional->node, sizeof(rbnode_type));
+ 			temp->node.parent = NULL;
+ #endif
+ 			temp->number = additional->number;
+@@ -1113,7 +1113,7 @@ answer_authoritative(struct nsd   *nsd,
+ 		match->rnode = NULL;
+ 		match->dname = wildcard_child->dname;
+ #else
+-		memcpy(&match->node, &wildcard_child->node, sizeof(rbnode_t));
++		memcpy(&match->node, &wildcard_child->node, sizeof(rbnode_type));
+ 		match->node.parent = NULL;
+ #endif
+ 		match->parent = closest_encloser;