holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fix INCLUDE in params file

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5326 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-01-30 17:57:10 +00:00
parent 4b485e5985
commit 0136dbbea8
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/changelog.txt
View File

@ -6,7 +6,10 @@ Changes in 3.4.0 RC 1
3) Add macro for SixXS. 3) Add macro for SixXS.
4) Allow ranges and ipset names in the ADDRESSES column of maclist file. 4) Allow ranges and ipset names in the ADDRESSES column of maclist
file.
5) Fix INCLUDE in extension scripts and /etc/shorewall/params.
Changes in 3.4.0 Beta 3 Changes in 3.4.0 Beta 3

8
Shorewall/compiler
View File

@ -100,13 +100,15 @@ progress_message_and_save()
# #
indent() { indent() {
if [ -n "$INDENT" ]; then if [ -n "$INDENT" ]; then
if [ -n "$HAVEAWK" ]; then if [ $# -ge 1 ]; then
eval awk \''BEGIN { indent=1; }; /^\s*$/ { print ""; indent=1; next; }; { if (indent == 1) print "'"$INDENT"'" $0; else print; }; { indent=1; }; /\\$/ { indent=0; };'\' $1 read_file $1 0 | eval sed \'s\/^/"$INDENT"\/\' -
else else
eval sed \'s\/^/"$INDENT"\/\' $1 eval sed \'s\/^/"$INDENT"\/\' $1
fi fi
elif [ $# -ge 1 ]; then
read_file $1 0
else else
cat $1 cat
fi fi
} }

4
Shorewall/releasenotes.txt
View File

@ -72,6 +72,10 @@ Problems Corrected in 3.4.0 RC1
This problem has been corrected in RC1. This problem has been corrected in RC1.
4) Previously, if "INCLUDE <filename>" appeared in
/etc/shorewall/params or in an extension script then run-time
errors occured.
Other Changes in 3.4.0 RC 1 Other Changes in 3.4.0 RC 1
1) A macro that handles SixXS has been contributed by Christian 1) A macro that handles SixXS has been contributed by Christian