From owner-svn-src-all@FreeBSD.ORG  Thu Sep 18 13:53:40 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3F552EB4;
 Thu, 18 Sep 2014 13:53:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 29E8E8F2;
 Thu, 18 Sep 2014 13:53:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8IDreRv049571;
 Thu, 18 Sep 2014 13:53:40 GMT (envelope-from des@FreeBSD.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8IDre2A049570;
 Thu, 18 Sep 2014 13:53:40 GMT (envelope-from des@FreeBSD.org)
Message-Id: <201409181353.s8IDre2A049570@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: des set sender to des@FreeBSD.org
 using -f
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Thu, 18 Sep 2014 13:53:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r271760 - stable/10/usr.sbin/unbound/local-setup
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Sep 2014 13:53:40 -0000

Author: des
Date: Thu Sep 18 13:53:39 2014
New Revision: 271760
URL: http://svnweb.freebsd.org/changeset/base/271760

Log:
  MFH (r271255): fix parsing of ipv6 nameserver lines
  
  Approved by:	re (kib)

Modified:
  stable/10/usr.sbin/unbound/local-setup/local-unbound-setup.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/unbound/local-setup/local-unbound-setup.sh
==============================================================================
--- stable/10/usr.sbin/unbound/local-setup/local-unbound-setup.sh	Thu Sep 18 13:39:47 2014	(r271759)
+++ stable/10/usr.sbin/unbound/local-setup/local-unbound-setup.sh	Thu Sep 18 13:53:39 2014	(r271760)
@@ -178,7 +178,7 @@ gen_forward_conf() {
 	echo "forward-zone:"
 	echo "        name: ."
 	for forwarder ; do
-		if expr "${forwarder}" : "^[0-9:.]\{1,\}$" >/dev/null ; then
+		if expr "${forwarder}" : "^[0-9A-Fa-f:.]\{1,\}$" >/dev/null ; then
 			echo "        forward-addr: ${forwarder}"
 		else
 			echo "        forward-host: ${forwarder}"