aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2011-09-13 00:09:47 +0000
committerHiroki Sato <hrs@FreeBSD.org>2011-09-13 00:09:47 +0000
commitd4358e709f011e81c52fe142c8a35d569a5ac2db (patch)
treed7987fad882cfcdf1e5947e7685f5a6f5d1df315
parent049087a0f37650cc9829f6709f3108829ded2177 (diff)
downloadsrc-d4358e709f011e81c52fe142c8a35d569a5ac2db.tar.gz
src-d4358e709f011e81c52fe142c8a35d569a5ac2db.zip
- Add an warning when ifconfig_IF_ipv6 has no inet6 keyword in front
of an IPv6 address. (r225489) - Use eval for ${ifconfig_args} to fix an issue fixed in r223506. (r225489) Approved by: re (bz)
Notes
Notes: svn path=/head/; revision=225522
-rw-r--r--etc/network.subr12
1 files changed, 10 insertions, 2 deletions
diff --git a/etc/network.subr b/etc/network.subr
index ae3db56adb35..8e9036d9a5bf 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -126,8 +126,16 @@ ifconfig_up()
# ifconfig_IF_ipv6
ifconfig_args=`ifconfig_getargs $1 ipv6`
if [ -n "${ifconfig_args}" ]; then
+ # backward compatibility: inet6 keyword
+ case "${ifconfig_args}" in
+ :*|[0-9a-fA-F]*:*)
+ warn "\$ifconfig_$1_ipv6 needs " \
+ "\"inet6\" keyword for an IPv6 address."
+ ifconfig_args="inet6 ${ifconfig_args}"
+ ;;
+ esac
ifconfig $1 inet6 -ifdisabled
- ifconfig $1 ${ifconfig_args}
+ eval ifconfig $1 ${ifconfig_args}
_cfg=0
fi
@@ -137,7 +145,7 @@ ifconfig_up()
warn "\$ipv6_ifconfig_$1 is obsolete." \
" Use ifconfig_$1_ipv6 instead."
ifconfig $1 inet6 -ifdisabled
- ifconfig $1 inet6 ${ifconfig_args}
+ eval ifconfig $1 inet6 ${ifconfig_args}
_cfg=0
fi
fi