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
This commit is contained in:
Crist J. Clark 2002-03-19 01:56:04 +00:00
parent 54ed0c3221
commit 5b7e37d2b7
7 changed files with 21 additions and 7 deletions

View File

@ -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
#

View File

@ -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
#

View File

@ -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
#

View File

@ -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
#

View File

@ -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
#

View File

@ -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
#

View File

@ -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
#