From owner-svn-src-head@FreeBSD.ORG  Wed Jun 10 16:15:23 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 731CEED4;
 Wed, 10 Jun 2015 16:15:23 +0000 (UTC) (envelope-from ume@FreeBSD.org)
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 619FD1200;
 Wed, 10 Jun 2015 16:15:23 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5AGFNq0007093;
 Wed, 10 Jun 2015 16:15:23 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5AGFNFS007092;
 Wed, 10 Jun 2015 16:15:23 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201506101615.t5AGFNFS007092@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Wed, 10 Jun 2015 16:15:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284229 - head/lib/libc/resolv
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2015 16:15:23 -0000

Author: ume
Date: Wed Jun 10 16:15:22 2015
New Revision: 284229
URL: https://svnweb.freebsd.org/changeset/base/284229

Log:
  Add support for '_' occurring at the beginning or end of a name
  component.
  
  PR:		176093
  Submitted by:	landonf__at__bikemonkey.org
  MFC after:	1 week

Modified:
  head/lib/libc/resolv/res_comp.c

Modified: head/lib/libc/resolv/res_comp.c
==============================================================================
--- head/lib/libc/resolv/res_comp.c	Wed Jun 10 16:00:09 2015	(r284228)
+++ head/lib/libc/resolv/res_comp.c	Wed Jun 10 16:15:22 2015	(r284229)
@@ -147,12 +147,12 @@ dn_skipname(const u_char *ptr, const u_c
 		   || ((c) >= 0x61 && (c) <= 0x7a))
 #define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
 
-#define borderchar(c) (alphachar(c) || digitchar(c))
 #ifdef	RES_ENFORCE_RFC1034
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
+#define borderchar(c) (alphachar(c) || digitchar(c))
 #else
-#define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c))
+#define borderchar(c) (alphachar(c) || digitchar(c) || underscorechar(c))
 #endif
+#define middlechar(c) (borderchar(c) || hyphenchar(c))
 #define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
 
 int