diff options
author | Darren Reed <darrenr@FreeBSD.org> | 2001-10-20 04:46:32 +0000 |
---|---|---|
committer | Darren Reed <darrenr@FreeBSD.org> | 2001-10-20 04:46:32 +0000 |
commit | f645349388af0ad08acb9bf95ba4fc3f82141548 (patch) | |
tree | ad2784b2a6f5d8e28aeafe14a230758847158cad /etc | |
parent | 9645656d2c6fef81c4bb49896d7d4796b0be5878 (diff) | |
download | src-f645349388af0ad08acb9bf95ba4fc3f82141548.tar.gz src-f645349388af0ad08acb9bf95ba4fc3f82141548.zip |
Do an ipf -y after bringing up ppp to ensure rules which mention ppp get
matched. Moification on PR to handle ipnat not being dependant on
ipfilter_enable
PR: 22859
Notes
Notes:
svn path=/head/; revision=85222
Diffstat (limited to 'etc')
-rw-r--r-- | etc/network.subr | 14 | ||||
-rw-r--r-- | etc/rc.d/netoptions | 14 | ||||
-rw-r--r-- | etc/rc.d/network1 | 14 | ||||
-rw-r--r-- | etc/rc.d/network2 | 14 | ||||
-rw-r--r-- | etc/rc.d/network3 | 14 | ||||
-rw-r--r-- | etc/rc.d/routing | 14 | ||||
-rw-r--r-- | etc/rc.network | 14 |
7 files changed, 98 insertions, 0 deletions
diff --git a/etc/network.subr b/etc/network.subr index 340be2832916..1f50bea54b8d 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -275,6 +275,20 @@ network_pass1() { ;; esac + # Re-Sync ipfilter + # + case ${ipfilter_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + *) + case ${ipnat_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + esac + esac + # Initialize IP filtering using ipfw # if /sbin/ipfw -q flush > /dev/null 2>&1; then diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 340be2832916..1f50bea54b8d 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -275,6 +275,20 @@ network_pass1() { ;; esac + # Re-Sync ipfilter + # + case ${ipfilter_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + *) + case ${ipnat_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + esac + esac + # Initialize IP filtering using ipfw # if /sbin/ipfw -q flush > /dev/null 2>&1; then diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 340be2832916..1f50bea54b8d 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -275,6 +275,20 @@ network_pass1() { ;; esac + # Re-Sync ipfilter + # + case ${ipfilter_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + *) + case ${ipnat_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + esac + esac + # Initialize IP filtering using ipfw # if /sbin/ipfw -q flush > /dev/null 2>&1; then diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 340be2832916..1f50bea54b8d 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -275,6 +275,20 @@ network_pass1() { ;; esac + # Re-Sync ipfilter + # + case ${ipfilter_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + *) + case ${ipnat_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + esac + esac + # Initialize IP filtering using ipfw # if /sbin/ipfw -q flush > /dev/null 2>&1; then diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 340be2832916..1f50bea54b8d 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -275,6 +275,20 @@ network_pass1() { ;; esac + # Re-Sync ipfilter + # + case ${ipfilter_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + *) + case ${ipnat_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + esac + esac + # Initialize IP filtering using ipfw # if /sbin/ipfw -q flush > /dev/null 2>&1; then diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 340be2832916..1f50bea54b8d 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -275,6 +275,20 @@ network_pass1() { ;; esac + # Re-Sync ipfilter + # + case ${ipfilter_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + *) + case ${ipnat_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + esac + esac + # Initialize IP filtering using ipfw # if /sbin/ipfw -q flush > /dev/null 2>&1; then diff --git a/etc/rc.network b/etc/rc.network index 340be2832916..1f50bea54b8d 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -275,6 +275,20 @@ network_pass1() { ;; esac + # Re-Sync ipfilter + # + case ${ipfilter_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + *) + case ${ipnat_enable} in + [Yy][Ee][Ss]) + ${ipfilter_program:-/sbin/ipf -y} + ;; + esac + esac + # Initialize IP filtering using ipfw # if /sbin/ipfw -q flush > /dev/null 2>&1; then |