diff options
| author | cjc <cjc@FreeBSD.org> | 2002-03-19 01:56:04 +0000 |
|---|---|---|
| committer | cjc <cjc@FreeBSD.org> | 2002-03-19 01:56:04 +0000 |
| commit | 505f3e0be89b99c2badc4058ab20e59267b33d64 (patch) | |
| tree | 5baa0f0bb7c0af89127f068f97ba593628a2ced9 /etc | |
| parent | 56e86a0a0bd23f181ae03b6f6acbe8b41e61eed6 (diff) | |
| download | FreeBSD-src-505f3e0be89b99c2badc4058ab20e59267b33d64.zip FreeBSD-src-505f3e0be89b99c2badc4058ab20e59267b33d64.tar.gz | |
IPFilter may need to be re-sync'ed even if we are not filtering, but
only doing ipnat(8). Go back to using $ipfilter_active, but turn off
$ipfilter_active when loading ipl.ko has failed.
Submitted by: devet@devet.org (Arjan de Vet)
MFC after: 3 days
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/network.subr | 4 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 4 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 4 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 4 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 4 | ||||
| -rw-r--r-- | etc/rc.d/routing | 4 | ||||
| -rw-r--r-- | etc/rc.network | 4 |
7 files changed, 21 insertions, 7 deletions
diff --git a/etc/network.subr b/etc/network.subr index 2146b90..59f5370 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -85,6 +85,7 @@ network_pass1() { else echo 'Warning: IP-filter module failed to load.' # avoid further errors + ipfilter_active="NO" ipmon_enable="NO" ipfilter_enable="NO" ipnat_enable="NO" @@ -298,11 +299,12 @@ network_pass1() { # Re-Sync ipfilter so it picks up any new network interfaces # - case ${ipfilter_enable} in + case ${ipfilter_active} 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 2146b90..59f5370 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -85,6 +85,7 @@ network_pass1() { else echo 'Warning: IP-filter module failed to load.' # avoid further errors + ipfilter_active="NO" ipmon_enable="NO" ipfilter_enable="NO" ipnat_enable="NO" @@ -298,11 +299,12 @@ network_pass1() { # Re-Sync ipfilter so it picks up any new network interfaces # - case ${ipfilter_enable} in + case ${ipfilter_active} 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 2146b90..59f5370 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -85,6 +85,7 @@ network_pass1() { else echo 'Warning: IP-filter module failed to load.' # avoid further errors + ipfilter_active="NO" ipmon_enable="NO" ipfilter_enable="NO" ipnat_enable="NO" @@ -298,11 +299,12 @@ network_pass1() { # Re-Sync ipfilter so it picks up any new network interfaces # - case ${ipfilter_enable} in + case ${ipfilter_active} 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 2146b90..59f5370 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -85,6 +85,7 @@ network_pass1() { else echo 'Warning: IP-filter module failed to load.' # avoid further errors + ipfilter_active="NO" ipmon_enable="NO" ipfilter_enable="NO" ipnat_enable="NO" @@ -298,11 +299,12 @@ network_pass1() { # Re-Sync ipfilter so it picks up any new network interfaces # - case ${ipfilter_enable} in + case ${ipfilter_active} 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 2146b90..59f5370 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -85,6 +85,7 @@ network_pass1() { else echo 'Warning: IP-filter module failed to load.' # avoid further errors + ipfilter_active="NO" ipmon_enable="NO" ipfilter_enable="NO" ipnat_enable="NO" @@ -298,11 +299,12 @@ network_pass1() { # Re-Sync ipfilter so it picks up any new network interfaces # - case ${ipfilter_enable} in + case ${ipfilter_active} 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 2146b90..59f5370 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -85,6 +85,7 @@ network_pass1() { else echo 'Warning: IP-filter module failed to load.' # avoid further errors + ipfilter_active="NO" ipmon_enable="NO" ipfilter_enable="NO" ipnat_enable="NO" @@ -298,11 +299,12 @@ network_pass1() { # Re-Sync ipfilter so it picks up any new network interfaces # - case ${ipfilter_enable} in + case ${ipfilter_active} 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 2146b90..59f5370 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -85,6 +85,7 @@ network_pass1() { else echo 'Warning: IP-filter module failed to load.' # avoid further errors + ipfilter_active="NO" ipmon_enable="NO" ipfilter_enable="NO" ipnat_enable="NO" @@ -298,11 +299,12 @@ network_pass1() { # Re-Sync ipfilter so it picks up any new network interfaces # - case ${ipfilter_enable} in + case ${ipfilter_active} in [Yy][Ee][Ss]) ${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null ;; esac + unset ipfilter_active # Initialize IP filtering using ipfw # |
