From bd089fdbc07cf7a261fe9b3d5326095cace2fac6 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Fri, 20 Jul 2001 18:08:17 +0000
Subject: [PATCH] Do more strict checking for an interface.

Suggested by:	matusita@jp.FreeBSD.org
MFC after:	1 week
---
 etc/rc.d/network_ipv6 | 6 +++---
 etc/rc.network6       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index d1d8e09bc24..99f6b32c8fc 100644
--- a/etc/rc.d/network_ipv6
+++ b/etc/rc.d/network_ipv6
@@ -197,7 +197,7 @@ network6_pass1() {
 			'')
 				for i in ${ipv6_network_interfaces}; do
 					case $i in
-					lo0|gif*|stf*|faith*|lp[012]|sl[012]|tun[012])
+					lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
 						continue
 						;;
 					*)
@@ -302,7 +302,7 @@ network6_interface_setup() {
 		if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ]
 		then
 			case ${i} in
-			lo0|gif*|stf*|faith*|lp[012]|sl[012]|tun[012])
+			lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
 				;;
 			*)
 				rtsol_interfaces="${rtsol_interfaces} ${i}"
@@ -424,7 +424,7 @@ network6_default_interface_setup() {
 	'')
 		for i in ${ipv6_network_interfaces}; do
 			case $i in
-			lo0|faith*)
+			lo0|faith[0-9]*)
 				continue
 				;;
 			esac
diff --git a/etc/rc.network6 b/etc/rc.network6
index d1d8e09bc24..99f6b32c8fc 100644
--- a/etc/rc.network6
+++ b/etc/rc.network6
@@ -197,7 +197,7 @@ network6_pass1() {
 			'')
 				for i in ${ipv6_network_interfaces}; do
 					case $i in
-					lo0|gif*|stf*|faith*|lp[012]|sl[012]|tun[012])
+					lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
 						continue
 						;;
 					*)
@@ -302,7 +302,7 @@ network6_interface_setup() {
 		if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ]
 		then
 			case ${i} in
-			lo0|gif*|stf*|faith*|lp[012]|sl[012]|tun[012])
+			lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
 				;;
 			*)
 				rtsol_interfaces="${rtsol_interfaces} ${i}"
@@ -424,7 +424,7 @@ network6_default_interface_setup() {
 	'')
 		for i in ${ipv6_network_interfaces}; do
 			case $i in
-			lo0|faith*)
+			lo0|faith[0-9]*)
 				continue
 				;;
 			esac