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

Fix new params file processing for INCLUDE

Browse Source
This commit is contained in:
Tom Eastep 2010-11-13 10:59:09 -08:00
parent b20ed2d4de
commit 19122512d0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Config.pm
View File

@ -2889,7 +2889,9 @@ sub get_params() {
progress_message2 "Processing $fn ..."; progress_message2 "Processing $fn ...";
my @params = `$globals{SHAREDIRPL}/getparams $fn`; my $command = "$globals{SHAREDIRPL}/getparams $fn " . join( ':', @config_path );
my @params = `$command`;
fatal_error "Processing of $fn failed" if $?; fatal_error "Processing of $fn failed" if $?;

11
Shorewall/Perl/getparams
View File

@ -21,18 +21,19 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
exported=$(env | sed 's/=.*//'); . /usr/share/shorewall/lib.base
. /usr/share/shorewall/lib.cli
# exported=$(env | sed 's/=.*//');
# Sigh -- POSIX shells don't support 'typeset +x' or 'declare +x'
#
for v in $exported; do for v in $exported; do
eval t=\"\$$v\" eval t=\"\$$v\"
eval $v= eval unset $v
eval $v=\"$t\" eval $v=\"$t\"
done done
CONFIG_PATH="$2"
set -a set -a
. $1 . $1