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

Suppress 'show actions' error message when /etc/shorewall/actions doesn't exist

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8377 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-03-29 14:33:25 +00:00
parent ef5cc0bb6d
commit b2800ec734
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall-common/lib.cli
View File

@ -581,7 +581,13 @@ show_command() {
echo "rejNotSyn # Silently Reject Non-syn TCP packets"
echo "rej1918src # Reject packets with an RFC 1918 source address (Shorewall-perl only)"
echo "rej1918dst # Reject packets with an RFC 1918 original dest address (Shorewall-perl only)"
cat ${SHAREDIR}/actions.std ${CONFDIR}/actions | grep -Ev '^\#|^$'
if [ -f ${CONFDIR}/actions ]; then
cat ${SHAREDIR}/actions.std ${CONFDIR}/actions | grep -Ev '^\#|^$'
else
grep -Ev '^\#|^$' ${SHAREDIR}/actions.std
fi
return
;;
macros)

2
Shorewall-common/releasenotes.txt
View File

@ -96,7 +96,7 @@ Problems corrected in Shorewall-perl 4.1.7.
4) A POLICY of ":" in /etc/shorewall/policy would produce Perl
run-time errors.
6) An INTERFACE of ":" in /etc/shorewall/interfaces would produce Perl
5) An INTERFACE of ":" in /etc/shorewall/interfaces would produce Perl
run-time errors.
6) A MARK of ":" in /etc/shorewall/tcrules would produce Perl