Remove references to USE_ACTIONS

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-11-18 13:13:20 -08:00
parent c6ffdd67e2
commit 9dac330756
3 changed files with 10 additions and 33 deletions

View File

@ -108,13 +108,6 @@
omitted for this policy.</para> omitted for this policy.</para>
</listitem> </listitem>
<listitem>
<para>The name of an action (requires that USE_ACTIONS=Yes in
<ulink url="shorewall.conf.html">shorewall.conf</ulink>(5)).
That action will be invoked before the policy is
enforced.</para>
</listitem>
<listitem> <listitem>
<para>The name of a macro. The rules in that macro will be <para>The name of a macro. The rules in that macro will be
applied before the policy is enforced. This does not require applied before the policy is enforced. This does not require
@ -123,8 +116,6 @@
</orderedlist> </orderedlist>
<blockquote> <blockquote>
<programlisting></programlisting>
<para>Possible policies are:</para> <para>Possible policies are:</para>
</blockquote> </blockquote>

View File

@ -140,9 +140,9 @@
REJECT policies was specified in the file REJECT policies was specified in the file
/usr/share/shorewall/actions.std.</para> /usr/share/shorewall/actions.std.</para>
<para>To allow for default rules to be applied when USE_ACTIONS=No, <para>In Shorewall 4.4.0, the DROP_DEFAULT, REJECT_DEFAULT,
the DROP_DEFAULT, REJECT_DEFAULT, ACCEPT_DEFAULT, QUEUE_DEFAULT and ACCEPT_DEFAULT, QUEUE_DEFAULT and NFQUEUE_DEFAULT options were
NFQUEUE_DEFAULT options have been added.</para> added.</para>
<para>DROP_DEFAULT describes the rules to be applied before a <para>DROP_DEFAULT describes the rules to be applied before a
connection request is dropped by a DROP policy; REJECT_DEFAULT connection request is dropped by a DROP policy; REJECT_DEFAULT
@ -174,10 +174,6 @@
<member>NFQUEUE_DEFAULT="None"</member> <member>NFQUEUE_DEFAULT="None"</member>
</simplelist> </simplelist>
<para>If USE_ACTIONS=Yes, then these values refer to action.Drop and
action.Reject respectively. If USE_ACTIONS=No, then these values
refer to macro.Drop and macro.Reject.</para>
<para>If you set the value of either option to "None" then no <para>If you set the value of either option to "None" then no
default action will be used and the default action or macro must be default action will be used and the default action or macro must be
specified in <ulink specified in <ulink

View File

@ -109,22 +109,12 @@
</listitem> </listitem>
<listitem> <listitem>
<para>The name of an action (requires that USE_ACTIONS=Yes in <para>The name of an action. That action will be invoked before
<ulink url="shorewall6.conf.html">shorewall6.conf</ulink>(5)). the policy is enforced.</para>
That action will be invoked before the policy is
enforced.</para>
</listitem>
<listitem>
<para>The name of a macro. The rules in that macro will be
applied before the policy is enforced. This does not require
USE_ACTIONS=Yes.</para>
</listitem> </listitem>
</orderedlist> </orderedlist>
<blockquote> <blockquote>
<programlisting></programlisting>
<para>Possible policies are:</para> <para>Possible policies are:</para>
</blockquote> </blockquote>
@ -322,10 +312,10 @@
shorewall6-ipsec(5), shorewall6-maclist(5), shorewall6-masq(5), shorewall6-ipsec(5), shorewall6-maclist(5), shorewall6-masq(5),
shorewall6-nat(5), shorewall6-netmap(5), shorewall6-nat(5), shorewall6-netmap(5),
shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
shorewall6-providers(5), shorewall6-proxyarp(5), shorewall6-providers(5), shorewall6-proxyarp(5), shorewall6-rtrules(5),
shorewall6-rtrules(5), shorewall6-routestopped(5), shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para> shorewall6-zones(5)</para>
</refsect1> </refsect1>
</refentry> </refentry>