mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-20 07:14:06 +00:00
Allow ipnat_enable to be set to "yes" without requiring ipfiltre_enable to
be set to "yes" PR: 25223
This commit is contained in:
Darren Reed
parent
7b60aacc90
commit
9645656d2c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=85221
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue