Author: hrs
Date: Sat Oct 27 17:06:26 2012
New Revision: 242181
URL: http://svn.freebsd.org/changeset/base/242181
Log:
Fix an issue when ipv6_enable=YES && ipv6_gateway_enable=YES which could
prevent rtadvd(8) from working as intended.
Spotted by: brian
Discussed with: brian
Modified:
head/etc/network.subr
head/etc/rc.d/rtadvd
Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr Sat Oct 27 16:44:41 2012 (r242180)
+++ head/etc/network.subr Sat Oct 27 17:06:26 2012 (r242181)
@@ -504,7 +504,11 @@ ipv6_autoconfif()
# backward compatibility: $ipv6_enable
case $ipv6_enable in
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- return 0
+ if checkyesno ipv6_gateway_enable; then
+ return 1
+ else
+ return 0
+ fi
;;
esac
Modified: head/etc/rc.d/rtadvd
==============================================================================
--- head/etc/rc.d/rtadvd Sat Oct 27 16:44:41 2012 (r242180)
+++ head/etc/rc.d/rtadvd Sat Oct 27 17:06:26 2012 (r242181)
@@ -51,10 +51,6 @@ rtadvd_precmd()
;;
esac
- for iface in ${command_args}; do
- ifconfig ${iface} inet6 -accept_rtadv
- done
-
# Enable Router Renumbering, unicast case
# (use correct src/dst addr)
# rtadvd -R "in ipsec
ah/transport/fec0:0:0:1::1-fec0:0:0:10::1/require" ${ipv6_network_interfaces}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
