Rename DETECT_IPADDRS to DETECT_DNAT_IPADDRS

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@129 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2002-07-09 21:21:28 +00:00
parent 90b701de4d
commit 5fb079b6f3
2 changed files with 9 additions and 7 deletions

View File

@ -1490,7 +1490,7 @@ add_nat_rule() {
;; ;;
detect) detect)
addr= addr=
if [ -n "$DETECT_IPADDRS" && "$source"! = "$FW" ]; then if [ -n "$DETECT_DNAT_IPADDRS" -a "$source" != "$FW" ]; then
eval interfaces=\$${source}_interfaces eval interfaces=\$${source}_interfaces
for interface in $interfaces; do for interface in $interfaces; do
addr="`find_interface_address $interface` $addr" addr="`find_interface_address $interface` $addr"
@ -3313,7 +3313,7 @@ do_initialize() {
ROUTE_FILTER= ROUTE_FILTER=
NAT_BEFORE_RULES= NAT_BEFORE_RULES=
MULTIPORT= MULTIPORT=
DETECT_IPADDRS= DETECT_DNAT_IPADDRS=
stopping= stopping=
have_mutex= have_mutex=
masq_seq=1 masq_seq=1
@ -3387,7 +3387,7 @@ do_initialize() {
ROUTE_FILTER=`added_param_value_no ROUTE_FILTER $ROUTE_FILTER` ROUTE_FILTER=`added_param_value_no ROUTE_FILTER $ROUTE_FILTER`
NAT_BEFORE_RULES=`added_param_value_yes NAT_BEFORE_RULES $NAT_BEFORE_RULES` NAT_BEFORE_RULES=`added_param_value_yes NAT_BEFORE_RULES $NAT_BEFORE_RULES`
MULTIPORT=`added_param_value_no MULTIPORT $MULTIPORT` MULTIPORT=`added_param_value_no MULTIPORT $MULTIPORT`
DETECT_IPADDRS=`added_param_value_no DETECT_IPADDRS $DETECT_IPADDRS` DETECT_DNAT_IPADDRS=`added_param_value_no DETECT_DNAT_IPADDRS $DETECT_DNAT_IPADDRS`
} }
################################################################################ ################################################################################

View File

@ -228,7 +228,7 @@ NAT_BEFORE_RULES=Yes
MULTIPORT=No MULTIPORT=No
# IP ADDRESS DETECTION # DNAT IP Address Detection
# #
# Normally when Shorewall encounters the following rule: # Normally when Shorewall encounters the following rule:
# #
@ -251,10 +251,12 @@ MULTIPORT=No
# rule will forward connection requests on all of these addresses; # rule will forward connection requests on all of these addresses;
# that may not be what is desired. # that may not be what is desired.
# #
# By setting DETECT_IPADDRS=Yes, rules such as the above will apply # By setting DETECT_DNAT_IPADDRS=Yes, rules such as the above will apply
# only if the original destination address is the primary IP address of # only if the original destination address is the primary IP address of
# one of the interfaces associated with the source zone. # one of the interfaces associated with the source zone. Note that this
# requires all interfaces to the source zone to be up when the firewall
# is [re]started.
DETECT_IPADDRS=No DETECT_DNAT_IPADDRS=No
#LAST LINE -- DO NOT REMOVE #LAST LINE -- DO NOT REMOVE