diff options
| author | hrs <hrs@FreeBSD.org> | 2012-10-27 17:06:26 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2012-10-27 17:06:26 +0000 |
| commit | 94b3ca6d0016d7bad92eb4697f2b44d9b8f55f09 (patch) | |
| tree | b98d33f1177c69648165a687e99f2e52eef24f78 /etc | |
| parent | c04c652a9e78501a1cfb0f4e8484084cc91f26ec (diff) | |
| download | FreeBSD-src-94b3ca6d0016d7bad92eb4697f2b44d9b8f55f09.zip FreeBSD-src-94b3ca6d0016d7bad92eb4697f2b44d9b8f55f09.tar.gz | |
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/network.subr | 6 | ||||
| -rwxr-xr-x | etc/rc.d/rtadvd | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/network.subr b/etc/network.subr index 6d0de93..f7a7241 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -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 diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd index 8125f38..1ad40b8 100755 --- a/etc/rc.d/rtadvd +++ b/etc/rc.d/rtadvd @@ -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} |
