diff options
| -rw-r--r-- | etc/rc.d/auto_linklocal | 10 | ||||
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/etc/rc.d/auto_linklocal b/etc/rc.d/auto_linklocal index ea22631..f09e976 100644 --- a/etc/rc.d/auto_linklocal +++ b/etc/rc.d/auto_linklocal @@ -10,9 +10,15 @@ . /etc/rc.subr name="auto_linklocal" -rcvar=`set_rcvar ipv6` -start_cmd="${SYSCTL_W} net.inet6.ip6.auto_linklocal=1" +start_cmd="auto_linklocal_start" stop_cmd=":" +auto_linklocal_start() +{ + if ! checkyesno ipv6_enable; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 + fi +} + load_rc_config $name run_rc_command "$1" diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 722c3fd..55ae4f2 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -63,7 +63,7 @@ unsigned long in6_maxmtu = 0; #ifdef IP6_AUTO_LINKLOCAL int ip6_auto_linklocal = IP6_AUTO_LINKLOCAL; #else -int ip6_auto_linklocal = 0; /* disable by default */ +int ip6_auto_linklocal = 1; /* enable by default */ #endif struct callout in6_tmpaddrtimer_ch; |
