diff options
| author | gnn <gnn@FreeBSD.org> | 2006-10-02 10:13:30 +0000 |
|---|---|---|
| committer | gnn <gnn@FreeBSD.org> | 2006-10-02 10:13:30 +0000 |
| commit | 3b143b31f6f6cacd8c87d75bd85914a229caa6be (patch) | |
| tree | 6929e01f2949b2cf8707ffd3555b3dd8529a9464 | |
| parent | 230888a1f806217a00d1d503e7a1567f5b398576 (diff) | |
| download | FreeBSD-src-3b143b31f6f6cacd8c87d75bd85914a229caa6be.zip FreeBSD-src-3b143b31f6f6cacd8c87d75bd85914a229caa6be.tar.gz | |
Turn off automatic link local address if ipv6_enable is not set to YES
in rc.conf
Reviewed by: KAME core team, cperciva
MFC after: 3 days
| -rw-r--r-- | etc/network.subr | 4 | ||||
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/network.subr b/etc/network.subr index de2aaf4..ef344ae 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -41,6 +41,10 @@ ifconfig_up() { _cfg=1 + if checkyesno ipv6_enable; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 + fi + ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 55ae4f2..722c3fd 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 = 1; /* enable by default */ +int ip6_auto_linklocal = 0; /* disable by default */ #endif struct callout in6_tmpaddrtimer_ch; |
