aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Reed <darrenr@FreeBSD.org>2001-10-20 04:41:47 +0000
committerDarren Reed <darrenr@FreeBSD.org>2001-10-20 04:41:47 +0000
commit9645656d2c6fef81c4bb49896d7d4796b0be5878 (patch)
tree4091845a7f0d88004acf65065e82951da2423234
parent7b60aacc90007c37a87025c1a99a0d789fb2b05c (diff)
Allow ipnat_enable to be set to "yes" without requiring ipfiltre_enable to
be set to "yes" PR: 25223
Notes
Notes: svn path=/head/; revision=85221
Diffstat
-rw-r--r--etc/network.subr27
-rw-r--r--etc/rc.d/netoptions27
-rw-r--r--etc/rc.d/network127
-rw-r--r--etc/rc.d/network227
-rw-r--r--etc/rc.d/network327
-rw-r--r--etc/rc.d/routing27
-rw-r--r--etc/rc.network27
7 files changed, 112 insertions, 77 deletions
diff --git a/etc/network.subr b/etc/network.subr
index 51c2926fe597..340be2832916 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -85,17 +85,6 @@ network_pass1() {
${ipmon_program:-/sbin/ipmon} ${ipmon_flags}
;;
esac
- case "${ipnat_enable}" in
- [Yy][Ee][Ss])
- if [ -r "${ipnat_rules}" ]; then
- echo -n ' ipnat';
- eval ${ipnat_program:-/sbin/ipnat -CF -f} \
- "${ipnat_rules}" ${ipnat_flags}
- else
- echo -n ' NO IPNAT RULES'
- fi
- ;;
- esac
case "${ipfs_enable}" in
[Yy][Ee][Ss])
if [ -r "/var/db/ipf/ipstate.ipf" ]; then
@@ -109,6 +98,22 @@ network_pass1() {
ipfilter_enable="NO"
echo -n ' NO IPF RULES'
fi
+ esac
+ case "${ipnat_enable}" in
+ [Yy][Ee][Ss])
+ if [ "${ipfilter_in_kernel}" -eq 0 ] && kldload ipl; then
+ ipfilter_in_kernel=1
+ echo "Kernel ipfilter module loaded."
+ elif [ "${ipfilter_in_kernel}" -eq 0 ]; then
+ echo "Warning: ipfilter kernel module failed to load."
+ fi
+ if [ -r "${ipnat_rules}" ]; then
+ echo -n ' ipnat';
+ eval ${ipnat_program:-/sbin/ipnat -CF -f} \
+ "${ipnat_rules}" ${ipnat_flags}
+ else
+ echo -n ' NO IPNAT RULES'
+ fi
;;
esac
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 51c2926fe597..340be2832916 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -85,17 +85,6 @@ network_pass1() {
${ipmon_program:-/sbin/ipmon} ${ipmon_flags}
;;
esac
- case "${ipnat_enable}" in
- [Yy][Ee][Ss])
- if [ -r "${ipnat_rules}" ]; then
- echo -n ' ipnat';
- eval ${ipnat_program:-/sbin/ipnat -CF -f} \
- "${ipnat_rules}" ${ipnat_flags}
- else
- echo -n ' NO IPNAT RULES'
- fi
- ;;
- esac
case "${ipfs_enable}" in
[Yy][Ee][Ss])
if [ -r "/var/db/ipf/ipstate.ipf" ]; then
@@ -109,6 +98,22 @@ network_pass1() {
ipfilter_enable="NO"
echo -n ' NO IPF RULES'
fi
+ esac
+ case "${ipnat_enable}" in
+ [Yy][Ee][Ss])
+ if [ "${ipfilter_in_kernel}" -eq 0 ] && kldload ipl; then
+ ipfilter_in_kernel=1
+ echo "Kernel ipfilter module loaded."
+ elif [ "${ipfilter_in_kernel}" -eq 0 ]; then
+ echo "Warning: ipfilter kernel module failed to load."
+ fi
+ if [ -r "${ipnat_rules}" ]; then
+ echo -n ' ipnat';
+ eval ${ipnat_program:-/sbin/ipnat -CF -f} \
+ "${ipnat_rules}" ${ipnat_flags}
+ else
+ echo -n ' NO IPNAT RULES'
+ fi
;;
esac
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 51c2926fe597..340be2832916 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -85,17 +85,6 @@ network_pass1() {
${ipmon_program:-/sbin/ipmon} ${ipmon_flags}
;;
esac
- case "${ipnat_enable}" in
- [Yy][Ee][Ss])
- if [ -r "${ipnat_rules}" ]; then
- echo -n ' ipnat';
- eval ${ipnat_program:-/sbin/ipnat -CF -f} \
- "${ipnat_rules}" ${ipnat_flags}
- else
- echo -n ' NO IPNAT RULES'
- fi
- ;;
- esac
case "${ipfs_enable}" in
[Yy][Ee][Ss])
if [ -r "/var/db/ipf/ipstate.ipf" ]; then
@@ -109,6 +98,22 @@ network_pass1() {
ipfilter_enable="NO"
echo -n ' NO IPF RULES'
fi
+ esac
+ case "${ipnat_enable}" in
+ [Yy][Ee][Ss])
+ if [ "${ipfilter_in_kernel}" -eq 0 ] && kldload ipl; then
+ ipfilter_in_kernel=1
+ echo "Kernel ipfilter module loaded."
+ elif [ "${ipfilter_in_kernel}" -eq 0 ]; then
+ echo "Warning: ipfilter kernel module failed to load."
+ fi
+ if [ -r "${ipnat_rules}" ]; then
+ echo -n ' ipnat';
+ eval ${ipnat_program:-/sbin/ipnat -CF -f} \
+ "${ipnat_rules}" ${ipnat_flags}
+ else
+ echo -n ' NO IPNAT RULES'
+ fi
;;
esac
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 51c2926fe597..340be2832916 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -85,17 +85,6 @@ network_pass1() {
${ipmon_program:-/sbin/ipmon} ${ipmon_flags}
;;
esac
- case "${ipnat_enable}" in
- [Yy][Ee][Ss])
- if [ -r "${ipnat_rules}" ]; then
- echo -n ' ipnat';
- eval ${ipnat_program:-/sbin/ipnat -CF -f} \
- "${ipnat_rules}" ${ipnat_flags}
- else
- echo -n ' NO IPNAT RULES'
- fi
- ;;
- esac
case "${ipfs_enable}" in
[Yy][Ee][Ss])
if [ -r "/var/db/ipf/ipstate.ipf" ]; then
@@ -109,6 +98,22 @@ network_pass1() {
ipfilter_enable="NO"
echo -n ' NO IPF RULES'
fi
+ esac
+ case "${ipnat_enable}" in
+ [Yy][Ee][Ss])
+ if [ "${ipfilter_in_kernel}" -eq 0 ] && kldload ipl; then
+ ipfilter_in_kernel=1
+ echo "Kernel ipfilter module loaded."
+ elif [ "${ipfilter_in_kernel}" -eq 0 ]; then
+ echo "Warning: ipfilter kernel module failed to load."
+ fi
+ if [ -r "${ipnat_rules}" ]; then
+ echo -n ' ipnat';
+ eval ${ipnat_program:-/sbin/ipnat -CF -f} \
+ "${ipnat_rules}" ${ipnat_flags}
+ else
+ echo -n ' NO IPNAT RULES'
+ fi
;;
esac
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 51c2926fe597..340be2832916 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -85,17 +85,6 @@ network_pass1() {
${ipmon_program:-/sbin/ipmon} ${ipmon_flags}
;;
esac
- case "${ipnat_enable}" in
- [Yy][Ee][Ss])
- if [ -r "${ipnat_rules}" ]; then
- echo -n ' ipnat';
- eval ${ipnat_program:-/sbin/ipnat -CF -f} \
- "${ipnat_rules}" ${ipnat_flags}
- else
- echo -n ' NO IPNAT RULES'
- fi
- ;;
- esac
case "${ipfs_enable}" in
[Yy][Ee][Ss])
if [ -r "/var/db/ipf/ipstate.ipf" ]; then
@@ -109,6 +98,22 @@ network_pass1() {
ipfilter_enable="NO"
echo -n ' NO IPF RULES'
fi
+ esac
+ case "${ipnat_enable}" in
+ [Yy][Ee][Ss])
+ if [ "${ipfilter_in_kernel}" -eq 0 ] && kldload ipl; then
+ ipfilter_in_kernel=1
+ echo "Kernel ipfilter module loaded."
+ elif [ "${ipfilter_in_kernel}" -eq 0 ]; then
+ echo "Warning: ipfilter kernel module failed to load."
+ fi
+ if [ -r "${ipnat_rules}" ]; then
+ echo -n ' ipnat';
+ eval ${ipnat_program:-/sbin/ipnat -CF -f} \
+ "${ipnat_rules}" ${ipnat_flags}
+ else
+ echo -n ' NO IPNAT RULES'
+ fi
;;
esac
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 51c2926fe597..340be2832916 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -85,17 +85,6 @@ network_pass1() {
${ipmon_program:-/sbin/ipmon} ${ipmon_flags}
;;
esac
- case "${ipnat_enable}" in
- [Yy][Ee][Ss])
- if [ -r "${ipnat_rules}" ]; then
- echo -n ' ipnat';
- eval ${ipnat_program:-/sbin/ipnat -CF -f} \
- "${ipnat_rules}" ${ipnat_flags}
- else
- echo -n ' NO IPNAT RULES'
- fi
- ;;
- esac
case "${ipfs_enable}" in
[Yy][Ee][Ss])
if [ -r "/var/db/ipf/ipstate.ipf" ]; then
@@ -109,6 +98,22 @@ network_pass1() {
ipfilter_enable="NO"
echo -n ' NO IPF RULES'
fi
+ esac
+ case "${ipnat_enable}" in
+ [Yy][Ee][Ss])
+ if [ "${ipfilter_in_kernel}" -eq 0 ] && kldload ipl; then
+ ipfilter_in_kernel=1
+ echo "Kernel ipfilter module loaded."
+ elif [ "${ipfilter_in_kernel}" -eq 0 ]; then
+ echo "Warning: ipfilter kernel module failed to load."
+ fi
+ if [ -r "${ipnat_rules}" ]; then
+ echo -n ' ipnat';
+ eval ${ipnat_program:-/sbin/ipnat -CF -f} \
+ "${ipnat_rules}" ${ipnat_flags}
+ else
+ echo -n ' NO IPNAT RULES'
+ fi
;;
esac
diff --git a/etc/rc.network b/etc/rc.network
index 51c2926fe597..340be2832916 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -85,17 +85,6 @@ network_pass1() {
${ipmon_program:-/sbin/ipmon} ${ipmon_flags}
;;
esac
- case "${ipnat_enable}" in
- [Yy][Ee][Ss])
- if [ -r "${ipnat_rules}" ]; then
- echo -n ' ipnat';
- eval ${ipnat_program:-/sbin/ipnat -CF -f} \
- "${ipnat_rules}" ${ipnat_flags}
- else
- echo -n ' NO IPNAT RULES'
- fi
- ;;
- esac
case "${ipfs_enable}" in
[Yy][Ee][Ss])
if [ -r "/var/db/ipf/ipstate.ipf" ]; then
@@ -109,6 +98,22 @@ network_pass1() {
ipfilter_enable="NO"
echo -n ' NO IPF RULES'
fi
+ esac
+ case "${ipnat_enable}" in
+ [Yy][Ee][Ss])
+ if [ "${ipfilter_in_kernel}" -eq 0 ] && kldload ipl; then
+ ipfilter_in_kernel=1
+ echo "Kernel ipfilter module loaded."
+ elif [ "${ipfilter_in_kernel}" -eq 0 ]; then
+ echo "Warning: ipfilter kernel module failed to load."
+ fi
+ if [ -r "${ipnat_rules}" ]; then
+ echo -n ' ipnat';
+ eval ${ipnat_program:-/sbin/ipnat -CF -f} \
+ "${ipnat_rules}" ${ipnat_flags}
+ else
+ echo -n ' NO IPNAT RULES'
+ fi
;;
esac
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-09 21:16:13 +0000