From aa5faffa269a219617ba0eaa8d3463886cd8a7ec Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Thu, 25 Jan 2001 13:18:26 +0000
Subject: [PATCH] - Don't try to send RA to lo0, gifN and faithN. -
 ipv6_network_interfaces has all available interfaces to work for   static
 configuration even if the host is end host.  When rtsol is   invoked,
 singleness of interface is checked.

---
 etc/rc.d/network_ipv6 | 24 +++++-------------------
 etc/rc.network6       | 24 +++++-------------------
 2 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index aa5030651520..6b4809ff5013 100644
--- a/etc/rc.d/network_ipv6
+++ b/etc/rc.d/network_ipv6
@@ -91,24 +91,10 @@ network6_pass1() {
 
 	case ${ipv6_network_interfaces} in
 	[Aa][Uu][Tt][Oo])
-		case ${ipv6_gateway_enable} in
-		[Yy][Ee][Ss])
-			#
-			# list of interfaces, and prefix for interfaces
-			#
-			ipv6_network_interfaces="`ifconfig -l`"
-			;;
-		*)
-			#
-			# manual configurations - in case ip6_gateway_enable=NO
-			# you can configure only single interface,
-			# as specification assumes that
-			# autoconfigured host has single interface only.
-			#
-			set `ifconfig -l`
-			ipv6_network_interfaces="$1"
-			;;
-		esac
+		#
+		# list of interfaces, and prefix for interfaces
+		#
+		ipv6_network_interfaces="`ifconfig -l`"
 		;;
 	esac
 
@@ -211,7 +197,7 @@ network6_pass1() {
 			'')
 				for i in ${ipv6_network_interfaces}; do
 					case $i in
-					stf*)
+					lo0|gif*|stf*|faith*)
 						continue
 						;;
 					*)
diff --git a/etc/rc.network6 b/etc/rc.network6
index aa5030651520..6b4809ff5013 100644
--- a/etc/rc.network6
+++ b/etc/rc.network6
@@ -91,24 +91,10 @@ network6_pass1() {
 
 	case ${ipv6_network_interfaces} in
 	[Aa][Uu][Tt][Oo])
-		case ${ipv6_gateway_enable} in
-		[Yy][Ee][Ss])
-			#
-			# list of interfaces, and prefix for interfaces
-			#
-			ipv6_network_interfaces="`ifconfig -l`"
-			;;
-		*)
-			#
-			# manual configurations - in case ip6_gateway_enable=NO
-			# you can configure only single interface,
-			# as specification assumes that
-			# autoconfigured host has single interface only.
-			#
-			set `ifconfig -l`
-			ipv6_network_interfaces="$1"
-			;;
-		esac
+		#
+		# list of interfaces, and prefix for interfaces
+		#
+		ipv6_network_interfaces="`ifconfig -l`"
 		;;
 	esac
 
@@ -211,7 +197,7 @@ network6_pass1() {
 			'')
 				for i in ${ipv6_network_interfaces}; do
 					case $i in
-					stf*)
+					lo0|gif*|stf*|faith*)
 						continue
 						;;
 					*)