mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-30 01:19:36 +01:00
Correct rule number calculation in 'shorewall add' code
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@436 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
1dc3bf9fce
commit
f9918b0da8
@ -17,3 +17,6 @@ Changes since 1.3.13
|
|||||||
7. Updated copyrights for 2003.
|
7. Updated copyrights for 2003.
|
||||||
|
|
||||||
8. Added support for openvpn tunnels on arbitrary ports
|
8. Added support for openvpn tunnels on arbitrary ports
|
||||||
|
|
||||||
|
9. Corrected rule number calculation problem in 'shorewall add' command
|
||||||
|
processing.
|
||||||
|
@ -4273,15 +4273,15 @@ add_to_zone() # $1 = <interface>[:<hosts>] $2 = zone
|
|||||||
rulenum=2
|
rulenum=2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! list_search $interface $filterping_interfaces; then
|
if list_search $interface $filterping_interfaces; then
|
||||||
rulenum=$(($rulenum + 1))
|
rulenum=$(($rulenum + 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! list_search $interface $maclist_interfaces; then
|
if list_search $interface $maclist_interfaces; then
|
||||||
rulenum=$(($rulenum + 1))
|
rulenum=$(($rulenum + 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! list_search $interface $tcpflags_interfaces; then
|
if list_search $interface $tcpflags_interfaces; then
|
||||||
rulenum=$(($rulenum + 1))
|
rulenum=$(($rulenum + 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -4306,11 +4306,11 @@ add_to_zone() # $1 = <interface>[:<hosts>] $2 = zone
|
|||||||
rulenum=2
|
rulenum=2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! list_search $interface $maclist_interfaces; then
|
if list_search $interface $maclist_interfaces; then
|
||||||
rulenum=$(($rulenum + 1))
|
rulenum=$(($rulenum + 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! list_search $interface $tcpflags_interfaces; then
|
if list_search $interface $tcpflags_interfaces; then
|
||||||
rulenum=$(($rulenum + 1))
|
rulenum=$(($rulenum + 1))
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -542,8 +542,8 @@ fi
|
|||||||
#
|
#
|
||||||
# Create the version file
|
# Create the version file
|
||||||
#
|
#
|
||||||
echo "$VERSION" > ${PREFIX}/usr/lib/shorewall/version
|
echo "$VERSION" > ${PREFIX}/usr/share/shorewall/version
|
||||||
chmod 644 ${PREFIX}/usr/lib/shorewall/version
|
chmod 644 ${PREFIX}/usr/share/shorewall/version
|
||||||
#
|
#
|
||||||
# Remove and create the symbolic link to the firewall script
|
# Remove and create the symbolic link to the firewall script
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user