extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 01:37:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Limit INCLUDE nest level

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@529 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-03-29 15:15:05 +00:00
parent 02a42e2fb0
commit f16f401910
2 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Shorewall/functions
View File

@ -185,13 +185,17 @@ mutex_off()
# Read a file and handle "INCLUDE" directives # Read a file and handle "INCLUDE" directives
# #
read_file() # $1 = file name read_file() # $1 = file name, $2 = nest count
{ {
local first rest local first rest
while read first rest; do while read first rest; do
if [ "x$first" = "xINCLUDE" ]; then if [ "x$first" = "xINCLUDE" ]; then
read_file `find_file ${rest%#*}` if [ $2 -lt 4 ]; then
read_file `find_file ${rest%#*}` $(($count + 1))
else
echo " WARNING: INCLUDE in $1 ignored (nested too deeply)" >&2
fi
else else
echo "$first $rest" echo "$first $rest"
fi fi
@ -216,7 +220,7 @@ strip_file() # $1 = Base Name of the file, $2 = Full Name of File (optional)
[ $# = 1 ] && fname=`find_file $1` || fname=$2 [ $# = 1 ] && fname=`find_file $1` || fname=$2
if [ -f $fname ]; then if [ -f $fname ]; then
read_file $fname | cut -d'#' -f1 | grep -v '^[[:space:]]*$' > $TMP_DIR/$1 read_file $fname 0 | cut -d'#' -f1 | grep -v '^[[:space:]]*$' > $TMP_DIR/$1
else else
> $TMP_DIR/$1 > $TMP_DIR/$1
fi fi

3
Shorewall/releasenotes.txt
View File

@ -61,5 +61,8 @@ New Features:
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
----- end rules ----- ----- end rules -----
INCLUDE's may be nested to a level of 3 -- further nested INCLUDE
directives are ignored.