From 94b3ca6d0016d7bad92eb4697f2b44d9b8f55f09 Mon Sep 17 00:00:00 2001
From: hrs <hrs@FreeBSD.org>
Date: Sat, 27 Oct 2012 17:06:26 +0000
Subject: [PATCH] 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
---
 etc/network.subr | 6 +++++-
 etc/rc.d/rtadvd  | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/network.subr b/etc/network.subr
index 6d0de939d951..f7a7241f2cb8 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 8125f38e5b66..1ad40b861680 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}