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

Don't deprecate 'optional' for shared providers

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-12-01 11:23:22 -08:00
parent a27f5655a7
commit 8c6914d1a2
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -385,8 +385,11 @@ sub process_a_provider() {
$loose = 1;
$default_balance = 0;
} elsif ( $option eq 'optional' ) {
warning_message q(The 'optional' provider option is deprecated - use the 'optional' interface option instead);
set_interface_option $interface, 'optional', 1;
unless ( $shared ) {
warning_message q(The 'optional' provider option is deprecated - use the 'optional' interface option instead);
set_interface_option $interface, 'optional', 1;
}
$optional = 1;
} elsif ( $option =~ /^src=(.*)$/ ) {
fatal_error "OPTION 'src' not allowed on shared interface" if $shared;

9
manpages/shorewall-providers.xml
View File

@ -211,8 +211,8 @@
</varlistentry>
<varlistentry>
<term><emphasis role="bold">optional
(deprecated)</emphasis></term>
<term><emphasis role="bold">optional (deprecated for use with
providers that do not share an interface)</emphasis></term>
<listitem>
<para>If the interface named in the INTERFACE column is not up
@ -220,8 +220,9 @@
If not specified, the value of the <option>optional</option>
option for the INTERFACE in <ulink
url="shorewall-interfaces.html">shorewall-interfaces(5)</ulink>
is assumed. Use of that option is preferred to this
one.</para>
is assumed. Use of that option is preferred to this one,
unless an <replaceable>address</replaceable> is provider in
the INTERFACE column.</para>
</listitem>
</varlistentry>

7
manpages6/shorewall6-providers.xml
View File

@ -208,7 +208,8 @@
</varlistentry>
<varlistentry>
<term><emphasis role="bold">optional</emphasis></term>
<term><emphasis role="bold">optional</emphasis> (deprecated for
use with providers that do not share an interface)</term>
<listitem>
<para>If the interface named in the INTERFACE column is not up
@ -216,7 +217,9 @@
If not specified, the value of the <option>optional</option>
option for the INTERFACE in <ulink
url="shorewall6-interfaces.html">shorewall6-interfaces(5)</ulink>
is assumed.</para>
is assumed. Use of that option is preferred to this one,
unless an <replaceable>address</replaceable> is provider in
the INTERFACE column.</para>
</listitem>
</varlistentry>