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

Pretty up the message when detect is specified

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4170 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-26 23:10:34 +00:00
parent 0c8f630b85
commit dcefe79ca7
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Shorewall/compiler
View File

@ -6430,6 +6430,7 @@ __EOF__
esac esac
if [ "$addrlist" = '$addrlist' ]; then if [ "$addrlist" = '$addrlist' ]; then
addresses='$(combine_list $addresses)'
indent >&3 << __EOF__ indent >&3 << __EOF__
addrlist= addrlist=
@ -8241,6 +8242,25 @@ ensure_and_save_command() {
eval \$@ || fatal_error "Command \"\$@\" failed" eval \$@ || fatal_error "Command \"\$@\" failed"
} }
__EOF__
#
# The following function(s) can be removed when we require version 30192 (below)
#
cat >&3 << __EOF__
#
# Undo the effect of 'separate_list()'
#
combine_list()
{
local f o=
for f in \$* ; do
o="\${o:+\$o,}\$f"
done
echo \$o
}
# #
# Initialize environment # Initialize environment
# #

16
Shorewall/functions
View File

@ -26,7 +26,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
LIBVERSION=30191 LIBVERSION=30192
[ -n "${VARDIR:=/var/lib/shorewall}" ] [ -n "${VARDIR:=/var/lib/shorewall}" ]
[ -n "${SHAREDIR:=/usr/share/shorewall}" ] [ -n "${SHAREDIR:=/usr/share/shorewall}" ]
@ -365,6 +365,20 @@ separate_list() {
echo "$newlist" echo "$newlist"
} }
#
# Undo the effect of 'separate_list()'
#
combine_list()
{
local f o=
for f in $* ; do
o="${o:+$o,}$f"
done
echo $o
}
# #
# Load a Kernel Module # Load a Kernel Module
# #