extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-24 19:51:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix brain-dead ipsec option handling in setup_masq()

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1873 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-12-30 21:14:24 +00:00
parent f25a9669eb
commit 2332d8803c
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall2/changelog.txt
View File

@ -200,3 +200,5 @@ Changes since 2.0.3
97) Fix <if>:: handling in setup_masq(). 97) Fix <if>:: handling in setup_masq().
98) Fix mis-leading typo in tunnels. 98) Fix mis-leading typo in tunnels.
99) Fix brain-dead ipsec option handling in setup_masq().

11
Shorewall2/firewall
View File

@ -4879,10 +4879,9 @@ get_routed_networks() # $1 = interface name
setup_masq() setup_masq()
{ {
do_ipsec_options() { do_ipsec_options() {
local options=$(separate_list $ipsec) option local options="$(separate_list $ipsec)" option
policy ="-m policy --pol ipsec --dir out" policy="-m policy --pol ipsec --dir out"
options=$(separate_list $options)
for option in $options; do for option in $options; do
case $option in case $option in
strict) policy="$policy --strict" ;; strict) policy="$policy --strict" ;;
@ -4921,7 +4920,11 @@ setup_masq()
policy="-m policy --pol none --dir out" policy="-m policy --pol none --dir out"
;; ;;
*) *)
[ -n "$ipsec" ] && do_ipsec_options || [ -n "$POLICY_MATCH" ] && policy="-m policy --pol none --dir out" if [ -n "$ipsec" ]; then
do_ipsec_options
elif [ -n "$POLICY_MATCH" ]; then
policy="-m policy --pol none --dir out"
fi
;; ;;
esac esac

8
Shorewall2/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall 2.2.0-RC3 Shorewall 2.2.0-RC4
---------------------------------------------------------------------- ----------------------------------------------------------------------
Problems Corrected since 2.0.3 Problems Corrected since 2.0.3
@ -207,6 +207,12 @@ Problems corrected since 2.2.0 RC2
an iptables rule. an iptables rule.
4) A misleading typo in /etc/shorewall/tunnels has been corrected. 4) A misleading typo in /etc/shorewall/tunnels has been corrected.
Problems corrected since 2.2.0 RC3
1) Several problems associated with processing the IPSEC colummn in
/etc/shorewall/masq have been corrected.
----------------------------------------------------------------------- -----------------------------------------------------------------------
Issues when migrating from Shorewall 2.0 to Shorewall 2.2: Issues when migrating from Shorewall 2.0 to Shorewall 2.2: