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

Back out params change

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5374 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-02-08 16:51:40 +00:00
parent 5afa06ef74
commit 567b2f37f9
4 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/compiler
View File

@ -5092,6 +5092,8 @@ __EOF__
__EOF__ __EOF__
fi fi
append_file params
cat >&3 << __EOF__ cat >&3 << __EOF__
STOPPING= STOPPING=

15
Shorewall/lib.base
View File

@ -909,6 +909,21 @@ resolve_file() # $1 = file name
esac esac
} }
#
# Perform variable substitution on the passed argument and echo the result
#
expand() # $@ = contents of variable which may be the name of another variable
{
eval echo \"$@\"
}
#
# Function for including one file into another
#
INCLUDE() {
. $(find_file $(expand $@))
}
# #
# Set the Shorewall state # Set the Shorewall state
# #

17
Shorewall/lib.config
View File

@ -171,14 +171,6 @@ list_count() {
list_count1 $(separate_list $1) list_count1 $(separate_list $1)
} }
#
# Perform variable substitution on the passed argument and echo the result
#
expand() # $@ = contents of variable which may be the name of another variable
{
eval echo \"$@\"
}
# #
# Filter that expands variables # Filter that expands variables
# #
@ -1604,13 +1596,6 @@ read_file() # $1 = file name, $2 = nest count
fi fi
} }
#
# Function for including one file into another
#
INCLUDE() {
. $(find_file $(expand $@))
}
# #
# Strip comments and blank lines from a file and place the result in the # Strip comments and blank lines from a file and place the result in the
# temporary directory # temporary directory
@ -1874,8 +1859,6 @@ do_initialize() {
run_user_exit params run_user_exit params
[ "$PROGRAM" = compiler ] && run_user_exit compile
config=$(find_file shorewall.conf) config=$(find_file shorewall.conf)
if [ -f $config ]; then if [ -f $config ]; then

26
Shorewall/releasenotes.txt
View File

@ -34,28 +34,14 @@ Problems Corrected in 3.4.0 RC2
automatically loaded by Shorewall. They have now been added to the automatically loaded by Shorewall. They have now been added to the
/usr/share/shorewall[-lite]/modules files. /usr/share/shorewall[-lite]/modules files.
2) If "INCLUDE <filename>" appeared in /etc/shorewall/params then
run-time errors occurred. This has been corrected. Note that if you
use INCLUDE in your params file in an export directory then the
included file must also be available on the firewall system in
/etc/shorewall-lite/.
Other Changes in 3.4.0 RC 1 Other Changes in 3.4.0 RC 1
1) In spite of my claim that I would not introduce any changes other
than bug fixes in a release candidate, I'm going to do so anyway.
Beginning with Shorewall 3.4.0 RC2, Shorewall will only process
/etc/shorewall/params during the compile phase. Any shell variables
needed at run-time by your extension scripts must be set in
/etc/shorewall/init.
In a Shorewall/Shorewall Lite environment, this allows
/etc/shorewall/params to be written to run exclusively
on the administrative system while /etc/shorewall/init runs
exclusively on the firewall system.
So shell variables required at compile time may be set in
/etc/shorewall/params and those required at run-time may be set in
/etc/shorewall/init.
As part of this change, extra white space is no longer removed from
/etc/shorewall/params as it was in RC1.
Migration Considerations: Migration Considerations:
If you are migrating from a Shorewall version earlier than 3.2.0 then If you are migrating from a Shorewall version earlier than 3.2.0 then