extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-22 15:43:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.0.13'

Browse Source
This commit is contained in:
Tom Eastep 2016-10-16 16:36:08 -07:00
commit f3dd77a3f1
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/manpages/shorewall.conf.xml
View File

@ -798,7 +798,7 @@
<para>Normally, only packets whose source address matches an <para>Normally, only packets whose source address matches an
entry in the ipset are dropped. If <option>src-dst</option> is entry in the ipset are dropped. If <option>src-dst</option> is
included, then packets whose destination address matches an included, then packets whose destination address matches an
entry in the ipset are also dropped. </para> entry in the ipset are also dropped.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -920,7 +920,8 @@ net all DROP info</programlisting>then the chain name is 'net-all'
an administrative system in directories containing the an administrative system in directories containing the
configurations of remote firewalls. The contents of the variable are configurations of remote firewalls. The contents of the variable are
the default value for the <replaceable>system</replaceable> the default value for the <replaceable>system</replaceable>
parameter to the <command>remote-reload</command> and parameter to the <command>remote-start</command>,
<command>remote-reload</command> and
<command>remote-restart</command> commands.</para> <command>remote-restart</command> commands.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

5
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -647,7 +647,7 @@
is SW_DBL6 and the default log level is <option>none</option> (no is SW_DBL6 and the default log level is <option>none</option> (no
logging). if <option>ipset-only</option> is given, then chain-based logging). if <option>ipset-only</option> is given, then chain-based
dynamic blacklisting is disabled just as if DYNAMIC_BLACKLISTING=No dynamic blacklisting is disabled just as if DYNAMIC_BLACKLISTING=No
had been specified. </para> had been specified.</para>
<para>Possible <replaceable>option</replaceable>s are:</para> <para>Possible <replaceable>option</replaceable>s are:</para>
@ -781,7 +781,8 @@ net all DROP info</programlisting>then the chain name is 'net-all'
an administrative system in directories containing the an administrative system in directories containing the
configurations of remote firewalls. The contents of the variable are configurations of remote firewalls. The contents of the variable are
the default value for the <replaceable>system</replaceable> the default value for the <replaceable>system</replaceable>
parameter to the <command>remote-reload</command> and parameter to the <command>remote-start</command>,
<command>remote-reload</command> and
<command>remote-restart</command> commands.</para> <command>remote-restart</command> commands.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>