From 36c5e2e9fe3b9b9db4a77ba38915a3aeb60a9665 Mon Sep 17 00:00:00 2001
From: hrs <hrs@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 27 Oct 2012 20:17:59 +0000
Subject: [PATCH] MFC of r242187:

Fix an issue when ipv6_enable=YES && ipv6_gateway_enable=YES which could
prevent rtadvd(8) from working as intended.

Approved by:	re (kib)


git-svn-id: svn://svn.freebsd.org/base/releng/9.1@242189 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/network.subr | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/etc/network.subr b/etc/network.subr
index 070f8849..b2e8cb86 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -109,7 +109,9 @@ ifconfig_up()
 		# backward compatibility: $ipv6_enable
 		case $ipv6_enable in
 		[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-			_ipv6_opts="${_ipv6_opts} accept_rtadv"
+			if ! checkyesno ipv6_gateway_enable; then
+				_ipv6_opts="${_ipv6_opts} accept_rtadv"
+			fi
 			;;
 		esac
 
@@ -488,7 +490,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
 
-- 
2.42.0