summaryrefslogtreecommitdiffstats
path: root/etc/network.subr
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2010-09-13 19:55:40 +0000
committerhrs <hrs@FreeBSD.org>2010-09-13 19:55:40 +0000
commitab8bbcbaf3da367884596f7a107151c3852c48bd (patch)
tree56f941df7e485c288db2471ec30c321abcef95f6 /etc/network.subr
parent462966ddac145fa0788ab9edcb608fa765a3225a (diff)
downloadFreeBSD-src-ab8bbcbaf3da367884596f7a107151c3852c48bd.zip
FreeBSD-src-ab8bbcbaf3da367884596f7a107151c3852c48bd.tar.gz
Split $ipv6_prefer into $ip6addrctl_policy and $ipv6_activate_all_interfaces.
The $ip6addrctl_policy is a variable to choose a pre-defined address selection policy set by ip6addrctl(8). The keyword "ipv4_prefer" sets IPv4-preferred one described in Section 10.3, the keyword "ipv6_prefer" sets IPv6-preferred one in Section 2.1 in RFC 3484, respectively. When "AUTO" is specified, it attempts to read /etc/ip6addrctl.conf first. If it is found, it reads and installs it as a policy table. If not, either of the two pre-defined policy tables is chosen automatically according to $ipv6_activate_all_interfaces. When $ipv6_activate_all_interfaces=NO, interfaces which have no corresponding $ifconfig_IF_ipv6 is marked as IFDISABLED for security reason. The default values are ip6addrctl_policy=AUTO and ipv6_activate_all_interfaces=NO. Discussed with: ume and bz
Diffstat (limited to 'etc/network.subr')
-rw-r--r--etc/network.subr2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/network.subr b/etc/network.subr
index 8097463..afd568c 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -100,7 +100,7 @@ ifconfig_up()
_ipv6_opts="-accept_rtadv"
fi
else
- if checkyesno ipv6_prefer; then
+ if checkyesno ipv6_activate_all_interfaces; then
_ipv6_opts="-ifdisabled"
else
_ipv6_opts="ifdisabled"
OpenPOWER on IntegriCloud