mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-24 00:23:28 +01:00
Yes more whitespace
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2710 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
96c4d02dbc
commit
09773c6c65
@ -5063,12 +5063,12 @@ add_nat_rule() {
|
|||||||
addnatrule $(dnat_chain $source) $cli $proto $multiport $sports $dports $(dest_ip_range $adr) -j $chain
|
addnatrule $(dnat_chain $source) $cli $proto $multiport $sports $dports $(dest_ip_range $adr) -j $chain
|
||||||
done
|
done
|
||||||
|
|
||||||
for z in $(separate_list $excludezones); do
|
for z in $(separate_list $excludezones); do
|
||||||
eval hosts=\$${z}_hosts
|
eval hosts=\$${z}_hosts
|
||||||
for host in $hosts; do
|
for host in $hosts; do
|
||||||
addnatrule $chain $(match_source_hosts ${host#*:}) -j RETURN
|
addnatrule $chain $(match_source_hosts ${host#*:}) -j RETURN
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -n "$loglevel" ]; then
|
if [ -n "$loglevel" ]; then
|
||||||
log_rule_limit $loglevel $chain $(dnat_chain $source) $logtarget "$ratelimit" "$logtag" -A -t nat
|
log_rule_limit $loglevel $chain $(dnat_chain $source) $logtarget "$ratelimit" "$logtag" -A -t nat
|
||||||
@ -5517,7 +5517,7 @@ process_rule() # $1 = target
|
|||||||
if [ -n "$userspec" ]; then
|
if [ -n "$userspec" ]; then
|
||||||
|
|
||||||
userandgroup="-m owner"
|
userandgroup="-m owner"
|
||||||
|
|
||||||
case "$userspec" in
|
case "$userspec" in
|
||||||
!*+*)
|
!*+*)
|
||||||
if [ -n "${userspec#*+}" ]; then
|
if [ -n "${userspec#*+}" ]; then
|
||||||
@ -5633,7 +5633,7 @@ process_rule() # $1 = target
|
|||||||
excludezones=
|
excludezones=
|
||||||
else
|
else
|
||||||
excludezones="${clientzone#*!}"
|
excludezones="${clientzone#*!}"
|
||||||
clientzone="${clientzone%!*}"
|
clientzone="${clientzone%!*}"
|
||||||
|
|
||||||
case $logtarget in
|
case $logtarget in
|
||||||
DNAT|REDIRECT|SAME)
|
DNAT|REDIRECT|SAME)
|
||||||
@ -5643,7 +5643,7 @@ process_rule() # $1 = target
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
validate_zone $clientzone || fatal_error "Undefined Client Zone in rule \"$rule\""
|
validate_zone $clientzone || fatal_error "Undefined Client Zone in rule \"$rule\""
|
||||||
|
|
||||||
# Parse and validate destination
|
# Parse and validate destination
|
||||||
@ -5701,7 +5701,7 @@ process_rule() # $1 = target
|
|||||||
servers=${servers%!*}
|
servers=${servers%!*}
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if ! validate_zone $serverzone; then
|
if ! validate_zone $serverzone; then
|
||||||
fatal_error "Undefined Server Zone in rule \"$rule\""
|
fatal_error "Undefined Server Zone in rule \"$rule\""
|
||||||
fi
|
fi
|
||||||
@ -5909,7 +5909,7 @@ process_macro() # $1 = target
|
|||||||
createactionchain $mtarget
|
createactionchain $mtarget
|
||||||
USEDACTIONS="$USEDACTIONS $mtarget"
|
USEDACTIONS="$USEDACTIONS $mtarget"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mtarget=$(find_logactionchain $mtarget)
|
mtarget=$(find_logactionchain $mtarget)
|
||||||
else
|
else
|
||||||
fatal_error "Invalid Action in rule \"$mtarget ${mclients:--} ${mservers:--} ${mprotocol:--} ${mports:--} ${mcports:--} ${xaddress:--} ${mratelimit:--} ${muserspec:--}\""
|
fatal_error "Invalid Action in rule \"$mtarget ${mclients:--} ${mservers:--} ${mprotocol:--} ${mports:--} ${mcports:--} ${xaddress:--} ${mratelimit:--} ${muserspec:--}\""
|
||||||
@ -6795,7 +6795,7 @@ setup_masq()
|
|||||||
if [ -n "$nomasq" ]; then
|
if [ -n "$nomasq" ]; then
|
||||||
if [ $COMMAND != check ]; then
|
if [ $COMMAND != check ]; then
|
||||||
build_exclusion_chain newchain nat $nomasq
|
build_exclusion_chain newchain nat $nomasq
|
||||||
|
|
||||||
if [ -n "$networks" ]; then
|
if [ -n "$networks" ]; then
|
||||||
for s in $networks; do
|
for s in $networks; do
|
||||||
for destnet in $(separate_list $destnets); do
|
for destnet in $(separate_list $destnets); do
|
||||||
@ -6911,7 +6911,7 @@ add_blacklist_rule() {
|
|||||||
if [ -n "$BLACKLIST_LOGLEVEL" ]; then
|
if [ -n "$BLACKLIST_LOGLEVEL" ]; then
|
||||||
log_rule $BLACKLIST_LOGLEVEL blacklst $BLACKLIST_DISPOSITION $(fix_bang $source $proto $dport)
|
log_rule $BLACKLIST_LOGLEVEL blacklst $BLACKLIST_DISPOSITION $(fix_bang $source $proto $dport)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run_iptables2 -A blacklst $source $proto $dport -j $disposition
|
run_iptables2 -A blacklst $source $proto $dport -j $disposition
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -7185,7 +7185,7 @@ load_kernel_modules()
|
|||||||
modules=$(find_file modules)
|
modules=$(find_file modules)
|
||||||
|
|
||||||
if [ -f $modules -a -d $MODULESDIR ]; then
|
if [ -f $modules -a -d $MODULESDIR ]; then
|
||||||
progress_message "Loading Modules..."
|
progress_message "Loading Modules..."
|
||||||
. $modules
|
. $modules
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -7407,12 +7407,12 @@ initialize_netfilter () {
|
|||||||
setpolicy INPUT ACCEPT
|
setpolicy INPUT ACCEPT
|
||||||
setpolicy OUTPUT ACCEPT
|
setpolicy OUTPUT ACCEPT
|
||||||
setpolicy FORWARD DROP
|
setpolicy FORWARD DROP
|
||||||
|
|
||||||
deleteallchains
|
deleteallchains
|
||||||
|
|
||||||
enable_critical_hosts
|
enable_critical_hosts
|
||||||
|
|
||||||
setpolicy INPUT DROP
|
setpolicy INPUT DROP
|
||||||
setpolicy OUTPUT DROP
|
setpolicy OUTPUT DROP
|
||||||
|
|
||||||
setcontinue FORWARD
|
setcontinue FORWARD
|
||||||
@ -7423,9 +7423,9 @@ initialize_netfilter () {
|
|||||||
setpolicy INPUT DROP
|
setpolicy INPUT DROP
|
||||||
setpolicy OUTPUT DROP
|
setpolicy OUTPUT DROP
|
||||||
setpolicy FORWARD DROP
|
setpolicy FORWARD DROP
|
||||||
|
|
||||||
deleteallchains
|
deleteallchains
|
||||||
|
|
||||||
setcontinue FORWARD
|
setcontinue FORWARD
|
||||||
setcontinue INPUT
|
setcontinue INPUT
|
||||||
setcontinue OUTPUT
|
setcontinue OUTPUT
|
||||||
@ -7823,7 +7823,7 @@ add_common_rules() {
|
|||||||
"WARNING: Cannot set ARP filtering on $interface"
|
"WARNING: Cannot set ARP filtering on $interface"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
for interface in $interfaces1; do
|
for interface in $interfaces1; do
|
||||||
file=/proc/sys/net/ipv4/conf/$interface/arp_ignore
|
file=/proc/sys/net/ipv4/conf/$interface/arp_ignore
|
||||||
if [ -f $file ]; then
|
if [ -f $file ]; then
|
||||||
@ -7858,7 +7858,7 @@ add_common_rules() {
|
|||||||
"WARNING: Cannot set route filtering on $interface"
|
"WARNING: Cannot set route filtering on $interface"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
run_and_save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
|
run_and_save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
|
||||||
|
|
||||||
if [ -n "$ROUTE_FILTER" ]; then
|
if [ -n "$ROUTE_FILTER" ]; then
|
||||||
@ -7913,7 +7913,7 @@ add_common_rules() {
|
|||||||
|
|
||||||
if [ -n "$interfaces" ]; then
|
if [ -n "$interfaces" ]; then
|
||||||
echo "Setting up Accept Source Routing..."
|
echo "Setting up Accept Source Routing..."
|
||||||
|
|
||||||
for interface in $interfaces; do
|
for interface in $interfaces; do
|
||||||
file=/proc/sys/net/ipv4/conf/$interface/accept_source_route
|
file=/proc/sys/net/ipv4/conf/$interface/accept_source_route
|
||||||
if [ -f $file ]; then
|
if [ -f $file ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user