From bde27f5c3cd935c6b16c38c8701a5922b0edaaac Mon Sep 17 00:00:00 2001
From: cjc <cjc@FreeBSD.org>
Date: Tue, 12 Mar 2002 20:25:25 +0000
Subject: The reload of ipf(8) rules should depend on $ipfilter_enable, not
 $ipfilter_active. $ipfilter_enable is set to "NO" if modules fail to load,
 and $ipfilter_active can be "YES" when we are not using ipf(8).

MFC after:	3 days
---
 etc/network.subr    | 3 +--
 etc/rc.d/netoptions | 3 +--
 etc/rc.d/network1   | 3 +--
 etc/rc.d/network2   | 3 +--
 etc/rc.d/network3   | 3 +--
 etc/rc.d/routing    | 3 +--
 etc/rc.network      | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/etc/network.subr b/etc/network.subr
index 0b8c39d..426ec2f 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -298,12 +298,11 @@ network_pass1() {
 
 	# Re-Sync ipfilter so it picks up any new network interfaces
 	#
-	case ${ipfilter_active} in
+	case ${ipfilter_enable} in
 	[Yy][Ee][Ss])
 		${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
 		;;
 	esac
-	unset ipfilter_active
 
 	# Initialize IP filtering using ipfw
 	#
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 0b8c39d..426ec2f 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -298,12 +298,11 @@ network_pass1() {
 
 	# Re-Sync ipfilter so it picks up any new network interfaces
 	#
-	case ${ipfilter_active} in
+	case ${ipfilter_enable} in
 	[Yy][Ee][Ss])
 		${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
 		;;
 	esac
-	unset ipfilter_active
 
 	# Initialize IP filtering using ipfw
 	#
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 0b8c39d..426ec2f 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -298,12 +298,11 @@ network_pass1() {
 
 	# Re-Sync ipfilter so it picks up any new network interfaces
 	#
-	case ${ipfilter_active} in
+	case ${ipfilter_enable} in
 	[Yy][Ee][Ss])
 		${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
 		;;
 	esac
-	unset ipfilter_active
 
 	# Initialize IP filtering using ipfw
 	#
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 0b8c39d..426ec2f 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -298,12 +298,11 @@ network_pass1() {
 
 	# Re-Sync ipfilter so it picks up any new network interfaces
 	#
-	case ${ipfilter_active} in
+	case ${ipfilter_enable} in
 	[Yy][Ee][Ss])
 		${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
 		;;
 	esac
-	unset ipfilter_active
 
 	# Initialize IP filtering using ipfw
 	#
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 0b8c39d..426ec2f 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -298,12 +298,11 @@ network_pass1() {
 
 	# Re-Sync ipfilter so it picks up any new network interfaces
 	#
-	case ${ipfilter_active} in
+	case ${ipfilter_enable} in
 	[Yy][Ee][Ss])
 		${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
 		;;
 	esac
-	unset ipfilter_active
 
 	# Initialize IP filtering using ipfw
 	#
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 0b8c39d..426ec2f 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -298,12 +298,11 @@ network_pass1() {
 
 	# Re-Sync ipfilter so it picks up any new network interfaces
 	#
-	case ${ipfilter_active} in
+	case ${ipfilter_enable} in
 	[Yy][Ee][Ss])
 		${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
 		;;
 	esac
-	unset ipfilter_active
 
 	# Initialize IP filtering using ipfw
 	#
diff --git a/etc/rc.network b/etc/rc.network
index 0b8c39d..426ec2f 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -298,12 +298,11 @@ network_pass1() {
 
 	# Re-Sync ipfilter so it picks up any new network interfaces
 	#
-	case ${ipfilter_active} in
+	case ${ipfilter_enable} in
 	[Yy][Ee][Ss])
 		${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null
 		;;
 	esac
-	unset ipfilter_active
 
 	# Initialize IP filtering using ipfw
 	#
-- 
cgit v1.1