Author: dteske
Date: Wed Jul 23 22:10:34 2014
New Revision: 269028
URL: http://svnweb.freebsd.org/changeset/base/269028
Log:
MFC r267812 (hrs): Fix ifname normalization. ifconfig_IF_alias{es,N} did not
work if ifname has any of [.-/+].
PR: conf/191961
Spotted by: jhay
MFC after: 3 days
Modified:
stable/9/etc/network.subr
Directory Properties:
stable/9/etc/ (props changed)
Modified: stable/9/etc/network.subr
==============================================================================
--- stable/9/etc/network.subr Wed Jul 23 21:08:04 2014 (r269027)
+++ stable/9/etc/network.subr Wed Jul 23 22:10:34 2014 (r269028)
@@ -1011,7 +1011,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=
@@ -1020,11 +1020,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=
@@ -1053,8 +1053,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
@@ -1063,8 +1063,8 @@ ifalias_af_common()
;;
alias:*)
_aliasn="${_aliasn} inet6 ${ifconfig_args}"
- warn "\$ipv6_ifconfig_${_if}_alias${alias} " \
- "is obsolete. Use ifconfig_$1_aliasN " \
+ warn "\$ipv6_ifconfig_${_vif}_alias${alias} " \
+ "is obsolete. Use ifconfig_${_vif}_aliasN
" \
"instead."
;;
esac
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
