Avoid wildcard rule creating NONE policy chain; formatting fix in manpage

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6571 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-16 16:36:51 +00:00
parent b99d548338
commit 3d7336cb79
2 changed files with 8 additions and 4 deletions

View File

@ -1009,7 +1009,7 @@ sub process_rule1 ( $$$$$$$$$$$ ) {
# Take care of chain # Take care of chain
# #
my $chain = "${sourcezone}2${destzone}"; my $chain = "${sourcezone}2${destzone}";
my $chainref = ensure_filter_chain $chain, 1; my $chainref = ensure_chain 'filter', $chain;
# #
# Validate Policy # Validate Policy
# #
@ -1033,6 +1033,10 @@ sub process_rule1 ( $$$$$$$$$$$ ) {
} }
} }
# #
# Mark the chain as referenced and add appropriate rules from earlier sections.
#
$chainref = ensure_filter_chain $chain, 1;
#
# For compatibility with older Shorewall versions # For compatibility with older Shorewall versions
# #
$origdest = ALLIPv4 if $origdest eq 'all'; $origdest = ALLIPv4 if $origdest eq 'all';

View File

@ -1200,9 +1200,9 @@
<term><emphasis role="bold">version</emphasis></term> <term><emphasis role="bold">version</emphasis></term>
<listitem> <listitem>
<para>Displays Shorewall's version. If the -a option is included, <para>Displays Shorewall's version. If the <option>-a</option>
the versions of Shorewall-shell and/or Shorewall-perl will also be option is included, the versions of Shorewall-shell and/or
displayed. </para> Shorewall-perl will also be displayed. </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>