Revert "Merge branch '4.5.21'"

This reverts commit 733a17470e, reversing
changes made to c9d7370fb4.
This commit is contained in:
Tom Eastep 2014-03-07 08:37:46 -08:00
parent 3ca3b8b552
commit 5104b2fa7c
3 changed files with 1 additions and 19 deletions

View File

@ -536,12 +536,6 @@ Web(ACCEPT) net $FW
IMAP(ACCEPT)net $FW</programlisting>
</example>
<caution>
<para>The Shorewall-provided macros assume that the associated service
is using it's standard port and will not work with services listening on
a non-standard port.</para>
</caution>
<para>You may also choose to code your rules directly without using the
pre-defined macros. This will be necessary in the event that there is not
a pre-defined macro that meets your requirements. In that case the general

View File

@ -971,12 +971,6 @@ ACCEPT dmz $FW udp 53 </programlist
code the appropriate rules directly. <ulink url="ports.html">This
page</ulink> can be of help if you don't know the protocol and port
involved.</para>
<caution>
<para>The Shorewall-provided macros assume that the service is using its
standard port and will not work with a service listening on a
non-standard port.</para>
</caution>
</section>
<section id="Open">

View File

@ -807,12 +807,6 @@ FTP(DNAT) net loc:10.10.10.1</programlisting> For
url="FTP.html">Shorewall FTP documentation</ulink> for more
information.</para>
</example> A couple of important points to keep in mind: <itemizedlist>
<listitem>
<para>The Shorewall-provided macros assume that the service is using
its standard port and will not work with a service listening on a
non-standard port.</para>
</listitem>
<listitem>
<para>You must test the above rule from a client outside of your
local network (i.e., don't test from a browser running on computers
@ -1086,7 +1080,7 @@ ACCEPT loc $FW tcp 80 #Allow Weblet to work</progra
</listitem>
</orderedlist>
<para>Also, I don't recommend using <quote><command>shorewall
<para> Also, I don't recommend using <quote><command>shorewall
restart</command></quote>; it is better to create an alternate
configuration and test it using the <quote><command>shorewall
try</command></quote> command.</para>