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

Fall back to /bin/sh if SHOREWALL_SHELL isn't viable

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7912 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-14 23:13:36 +00:00
parent 4c81d94097
commit 21cbf1567d
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/changelog.txt
View File

@ -6,6 +6,8 @@ Changes in 4.1.3
3) Fix LOG_VERBOSITY without STARTUP_LOG.
4) Fall back to /bin/sh if SHOREWALL_SHELL isn't viable.
Changes in 4.1.2
1) Enhanced Operational Logging

5
Shorewall-common/releasenotes.txt
View File

@ -24,7 +24,10 @@ Problems corrected in Shorewall 4.1.3.
Other changes in Shorewall 4.1.3.
None.
1) If the program named in SHOREWALL_SHELL doesn't exist or is not
executable, Shorewall and Shorewall-lite now both fall back to
/bin/sh after issuing a warning message. Previously, both
terminated with a fatal error.
Migration Issues.

4
Shorewall-common/shorewall
View File

@ -250,8 +250,8 @@ get_config() {
if [ -n "$SHOREWALL_SHELL" ]; then
if [ ! -x "$SHOREWALL_SHELL" ]; then
echo " ERROR: The program specified in SHOREWALL_SHELL does not exist or is not executable" >&2
exit 2
echo " WARNING: The program specified in SHOREWALL_SHELL does not exist or is not executable; falling back to /bin/sh" >&2
SHOREWALL_SHELL=/bin/sh
fi
fi

4
Shorewall-lite/shorewall-lite
View File

@ -136,8 +136,8 @@ get_config() {
if [ -n "$SHOREWALL_SHELL" ]; then
if [ ! -x "$SHOREWALL_SHELL" ]; then
echo " ERROR: The program specified in SHOREWALL_SHELL does not exist or is not executable" >&2
exit 2
echo " WARNING: The program specified in SHOREWALL_SHELL does not exist or is not executable; falling back to /bin/sh" >&2
SHOREWALL_SHELL=/bin/sh
fi
fi