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

Modify reload_command() and export_command() to directly call compiler()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-22 16:15:41 -08:00
parent 0afcf3c40c
commit 8ed6642387
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall-core/lib.cli
View File

@ -3347,6 +3347,7 @@ shorewall_cli() {
g_recovering= g_recovering=
g_timestamp= g_timestamp=
g_shorewalldir= g_shorewalldir=
g_haveconfig=
VERBOSE= VERBOSE=
VERBOSITY=1 VERBOSITY=1

25
Shorewall/lib.cli-std
View File

@ -367,7 +367,7 @@ compiler() {
# #
# We've now set g_shorewalldir so recalculate CONFIG_PATH # We've now set g_shorewalldir so recalculate CONFIG_PATH
# #
ensure_config_path [ -n "$g_haveconfig" ] || ensure_config_path
# #
# Get the config from $g_shorewalldir # Get the config from $g_shorewalldir
# #
@ -1431,22 +1431,25 @@ reload_command() # $* = original arguments less the command.
error_message " WARNING: $g_shorewalldir/shorewallrc does not exist; using settings from $SHAREDIR/shorewall" >&2 error_message " WARNING: $g_shorewalldir/shorewallrc does not exist; using settings from $SHAREDIR/shorewall" >&2
fi fi
if [ -z "$getcaps" ]; then
[ -f $g_shorewalldir/capabilities ] || getcaps=Yes
fi
if [ -f $g_shorewalldir/${g_program}.conf ]; then if [ -f $g_shorewalldir/${g_program}.conf ]; then
if [ -f $g_shorewalldir/params ]; then if [ -f $g_shorewalldir/params ]; then
. $g_shorewalldir/params . $g_shorewalldir/params
fi fi
. $g_shorewalldir/$g_program.conf
ensure_config_path ensure_config_path
get_config No
g_haveconfig=Yes
else else
fatal_error "$g_shorewalldir/$g_program.conf does not exist" fatal_error "$g_shorewalldir/$g_program.conf does not exist"
fi fi
if [ -z "$getcaps" ]; then
capabilities=$(find_file capabilities)
[ -f $capabilities ] || getcaps=Yes
fi
if [ -n "$getcaps" ]; then if [ -n "$getcaps" ]; then
[ -n "$DONT_LOAD" ] && DONT_LOAD="$(echo $DONT_LOAD | tr ',' ' ')" [ -n "$DONT_LOAD" ] && DONT_LOAD="$(echo $DONT_LOAD | tr ',' ' ')"
@ -1462,9 +1465,9 @@ reload_command() # $* = original arguments less the command.
file=$(resolve_file $g_shorewalldir/firewall) file=$(resolve_file $g_shorewalldir/firewall)
[ -n "$g_timestamp" ] && timestamp='-t' || timestamp= g_export=Yes
if $g_program $g_debugging $verbose $timestamp compile -e $g_shorewalldir $g_shorewalldir/firewall && \ if compiler $g_debugging compiler $g_shorewalldir/firewall && \
progress_message3 "Copying $file and ${file}.conf to ${system}:${litedir}..." && \ progress_message3 "Copying $file and ${file}.conf to ${system}:${litedir}..." && \
rcp_command "$g_shorewalldir/firewall $g_shorewalldir/firewall.conf" ${litedir} rcp_command "$g_shorewalldir/firewall $g_shorewalldir/firewall.conf" ${litedir}
then then
@ -1551,7 +1554,9 @@ export_command() # $* = original arguments less the command.
file=$(resolve_file $g_shorewalldir/firewall) file=$(resolve_file $g_shorewalldir/firewall)
if $g_program $g_debugging $verbose compile -e $g_shorewalldir $g_shorewalldir/firewall && \ g_export=Yes
if compiler $g_debugging compile $g_shorewalldir/firewall && \
echo "Copying $file and ${file}.conf to ${target#*@}..." && \ echo "Copying $file and ${file}.conf to ${target#*@}..." && \
scp $g_shorewalldir/firewall $g_shorewalldir/firewall.conf $target scp $g_shorewalldir/firewall $g_shorewalldir/firewall.conf $target
then then