Revert the default value of net.inet6.ip6.auto_linklocal to 1.

If ipv6_enable is not set to "YES", net.inet6.ip6.auto_linklocal
is turned to 0 at boot.

Discussed with:	re@, gnn@
MFC after:	3 days
This commit is contained in:
Hajimu UMEMOTO 2006-10-13 12:41:36 +00:00
parent 06274cee44
commit f5c04409eb
2 changed files with 9 additions and 3 deletions

View File

@ -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"

View File

@ -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;