Fix 'start' and 'stop' when shorewall-shell not installed

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5957 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-16 21:21:16 +00:00
parent d79961041e
commit 69175fdf60
3 changed files with 11 additions and 1 deletions

View File

@ -10,5 +10,9 @@ Changes in 3.9.2
5) Add IPPserver macro. 5) Add IPPserver macro.
6) Fix problem with 'stop' and 'clear' when shorewall-shell not
installed.

View File

@ -1965,7 +1965,7 @@ do_initialize() {
USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS) USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS)
EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS) EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS)
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes" [ "$PROGRAM" = compiler ] && [ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
[ -n "$XCONNMARK_MATCH" ] || XCONNMARK= [ -n "$XCONNMARK_MATCH" ] || XCONNMARK=
[ -n "$XMARK" ] || XCONNMARK= [ -n "$XMARK" ] || XCONNMARK=

View File

@ -43,6 +43,12 @@ Problems corrected in Shorewall 3.9.2
eth1.100 1 24kbit full 2 default eth1.100 1 24kbit full 2 default
------ ------
7) When shorewall-shell was not installed, 'shorewall stop' and
'shorewall clear' failed with the diagnostic:
ERROR: USE_ACTIONS=Yes requires the Shorewall Library actions
(/usr/share/shorewall-shell/lib.actions) which is not installed
Other changes in Shorewall 3.9.2 Other changes in Shorewall 3.9.2
1) A LOCKFILE option has been added to shorewall.conf. This file is 1) A LOCKFILE option has been added to shorewall.conf. This file is