diff options
| author | cjc <cjc@FreeBSD.org> | 2002-03-12 20:25:25 +0000 |
|---|---|---|
| committer | cjc <cjc@FreeBSD.org> | 2002-03-12 20:25:25 +0000 |
| commit | bde27f5c3cd935c6b16c38c8701a5922b0edaaac (patch) | |
| tree | 631789583beb43057c923c9fa1d3f3fe690ca9c0 /etc | |
| parent | 915168b6f7165fbaa526de9fee1a57501a2b1114 (diff) | |
| download | FreeBSD-src-bde27f5c3cd935c6b16c38c8701a5922b0edaaac.zip FreeBSD-src-bde27f5c3cd935c6b16c38c8701a5922b0edaaac.tar.gz | |
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/network.subr | 3 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 3 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 3 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 3 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 3 | ||||
| -rw-r--r-- | etc/rc.d/routing | 3 | ||||
| -rw-r--r-- | 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 # |
