From owner-svn-src-stable-8@FreeBSD.ORG Thu Jun 18 16:46:41 2015 Return-Path: Delivered-To: svn-src-stable-8@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35351E04; Thu, 18 Jun 2015 16:46:41 +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 22FA8829; Thu, 18 Jun 2015 16:46:41 +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 t5IGkf2F009451; Thu, 18 Jun 2015 16:46:41 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5IGkfWw009450; Thu, 18 Jun 2015 16:46:41 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201506181646.t5IGkfWw009450@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Thu, 18 Jun 2015 16:46:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r284561 - stable/8/lib/libc/resolv X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2015 16:46:41 -0000 Author: ume Date: Thu Jun 18 16:46:40 2015 New Revision: 284561 URL: https://svnweb.freebsd.org/changeset/base/284561 Log: MFC r284229: Add support for '_' occurring at the beginning or end of a name component. PR: 176093 Submitted by: landonf__at__bikemonkey.org Modified: stable/8/lib/libc/resolv/res_comp.c Directory Properties: stable/8/lib/libc/ (props changed) Modified: stable/8/lib/libc/resolv/res_comp.c ============================================================================== --- stable/8/lib/libc/resolv/res_comp.c Thu Jun 18 16:43:38 2015 (r284560) +++ stable/8/lib/libc/resolv/res_comp.c Thu Jun 18 16:46:40 2015 (r284561) @@ -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