From owner-svn-src-head@FreeBSD.ORG Tue Jun 24 07:50:49 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB4CAF1; Tue, 24 Jun 2014 07:50:49 +0000 (UTC) Received: from zibbi.meraka.csir.co.za (zibbi.meraka.csir.co.za [IPv6:2001:4200:7000:2::1]) by mx1.freebsd.org (Postfix) with ESMTP id 4F1EE2A45; Tue, 24 Jun 2014 07:50:49 +0000 (UTC) Received: by zibbi.meraka.csir.co.za (Postfix, from userid 3973) id 136AEB84D; Tue, 24 Jun 2014 09:50:46 +0200 (SAST) Date: Tue, 24 Jun 2014 09:50:46 +0200 From: John Hay To: Hiroki Sato Subject: Re: svn commit: r267812 - head/etc Message-ID: <20140624075045.GA53292@zibbi.meraka.csir.co.za> References: <201406240437.s5O4baoe064856@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201406240437.s5O4baoe064856@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 07:50:49 -0000 Hi Hiroki, Thanks for committing it. Will you also be merging it to 10? That is where I picked up the problem first. I see there was a bug filed over the weekend that looks like it might be the same problem: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191252 Regards John -- John Hay -- jhay@meraka.csir.co.za / jhay@meraka.org.za / jhay@FreeBSD.org On Tue, Jun 24, 2014 at 04:37:36AM +0000, Hiroki Sato wrote: > Author: hrs > Date: Tue Jun 24 04:37:36 2014 > New Revision: 267812 > URL: http://svnweb.freebsd.org/changeset/base/267812 > > Log: > Fix ifname normalization. ifconfig_IF_alias{es,N} did not work if ifname has > any of [.-/+]. > > Spotted by: jhay > > Modified: > head/etc/network.subr > > Modified: head/etc/network.subr > ============================================================================== > --- head/etc/network.subr Tue Jun 24 02:02:51 2014 (r267811) > +++ head/etc/network.subr Tue Jun 24 04:37:36 2014 (r267812) > @@ -1077,7 +1077,7 @@ ifalias_af_common_handler() > ifalias_af_common() > { > local _ret _if _af _action alias ifconfig_args _aliasn _c _tmpargs _iaf > - local _punct=".-/+" > + local _vif _punct=".-/+" > > _ret=1 > _aliasn= > @@ -1086,11 +1086,11 @@ ifalias_af_common() > _action=$3 > > # Normalize $_if before using it in a pattern to list_vars() > - ltr "$_if" "$_punct" "_" _if > + ltr "$_if" "$_punct" "_" _vif > > # ifconfig_IF_aliasN which starts with $_af > - for alias in `list_vars ifconfig_${_if}_alias[0-9]\* | > - sort_lite -nk1.$((9+${#_if}+7))` > + for alias in `list_vars ifconfig_${_vif}_alias[0-9]\* | > + sort_lite -nk1.$((9+${#_vif}+7))` > do > eval ifconfig_args=\"\$$alias\" > _iaf= > @@ -1118,8 +1118,8 @@ ifalias_af_common() > # backward compatibility: ipv6_ifconfig_IF_aliasN. > case $_af in > inet6) > - for alias in `list_vars ipv6_ifconfig_${_if}_alias[0-9]\* | > - sort_lite -nk1.$((14+${#_if}+7))` > + for alias in `list_vars ipv6_ifconfig_${_vif}_alias[0-9]\* | > + sort_lite -nk1.$((14+${#_vif}+7))` > do > eval ifconfig_args=\"\$$alias\" > case ${_action}:"${ifconfig_args}" in > @@ -1129,7 +1129,7 @@ ifalias_af_common() > alias:*) > _aliasn="${_aliasn} inet6 ${ifconfig_args}" > warn "\$${alias} is obsolete. " \ > - "Use ifconfig_$1_aliasN instead." > + "Use ifconfig_${_vif}_aliasN instead." > ;; > esac > done