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

Use "(S)" consistently in column headings.

Browse Source 
- add synonyms so both the singular and plural forms are accepted.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-05-11 12:42:04 -07:00
parent bad8b9bddb
commit 3d541f50c8
8 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Misc.pm
View File

@ -151,7 +151,7 @@ sub setup_ecn()
while ( read_a_line( NORMAL_READ ) ) { while ( read_a_line( NORMAL_READ ) ) {
my ($interface, $hosts ) = split_line 'ecn file entry', { interface => 0, hosts => 1 }; my ($interface, $hosts ) = split_line1 'ecn file entry', { interface => 0, host => 1, hosts => 1 }, {}, 2;
fatal_error 'INTERFACE must be specified' if $interface eq '-'; fatal_error 'INTERFACE must be specified' if $interface eq '-';
fatal_error "Unknown interface ($interface)" unless known_interface $interface; fatal_error "Unknown interface ($interface)" unless known_interface $interface;

2
Shorewall/Perl/Shorewall/Tunnels.pm
View File

@ -292,7 +292,7 @@ sub setup_tunnels() {
while ( read_a_line( NORMAL_READ ) ) { while ( read_a_line( NORMAL_READ ) ) {
my ( $kind, $zone, $gateway, $gatewayzones ) = split_line1 'tunnels file', { type => 0, zone => 1, gateway => 2, gateways => 2, gateway_zone => 3 }, undef, 4; my ( $kind, $zone, $gateway, $gatewayzones ) = split_line1 'tunnels file', { type => 0, zone => 1, gateway => 2, gateways => 2, gateway_zone => 3 , gateway_zones => 3 }, undef, 4;
fatal_error 'TYPE must be specified' if $kind eq '-'; fatal_error 'TYPE must be specified' if $kind eq '-';

2
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -1808,7 +1808,7 @@ sub compile_updown() {
# #
sub process_host( ) { sub process_host( ) {
my $ipsec = 0; my $ipsec = 0;
my ($zone, $hosts, $options ) = split_line 'hosts file', { zone => 0, hosts => 1, options => 2 }; my ($zone, $hosts, $options ) = split_line1 'hosts file', { zone => 0, host => 1, hosts => 1, options => 2 }, {}, 3;
fatal_error 'ZONE must be specified' if $zone eq '-'; fatal_error 'ZONE must be specified' if $zone eq '-';
fatal_error 'HOSTS must be specified' if $hosts eq '-'; fatal_error 'HOSTS must be specified' if $hosts eq '-';

4
Shorewall/configfiles/tunnels
View File

@ -7,5 +7,5 @@
# http://www.shorewall.net/manpages/shorewall-tunnels.html # http://www.shorewall.net/manpages/shorewall-tunnels.html
# #
############################################################################### ###############################################################################
#TYPE ZONE GATEWAYS GATEWAY #TYPE ZONE GATEWAY(S) GATEWAY
# ZONES # ZONE(S)

10
Shorewall/manpages/shorewall-tunnels.xml
View File

@ -125,9 +125,9 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">GATEWAY</emphasis>S - <term><emphasis role="bold">GATEWAY</emphasis>(S) (gateway or
<emphasis>address-or-range</emphasis> <emphasis role="bold">[ , ... gateways) - <emphasis>address-or-range</emphasis> <emphasis
]</emphasis></term> role="bold">[ , ... ]</emphasis></term>
<listitem> <listitem>
<para>The IP address of the remote tunnel gateway. If the remote <para>The IP address of the remote tunnel gateway. If the remote
@ -144,8 +144,8 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">GATEWAY ZONES</emphasis> (gateway_zone) - <term><emphasis role="bold">GATEWAY ZONES</emphasis> (gateway_zone or
[<emphasis>zone</emphasis>[<emphasis gateway_zones) - [<emphasis>zone</emphasis>[<emphasis
role="bold">,</emphasis><emphasis>zone</emphasis>]...]</term> role="bold">,</emphasis><emphasis>zone</emphasis>]...]</term>
<listitem> <listitem>

4
Shorewall6/configfiles/tunnels
View File

@ -7,5 +7,5 @@
# http://www.shorewall.net/manpages6/shorewall6-tunnels.html # http://www.shorewall.net/manpages6/shorewall6-tunnels.html
# #
############################################################################### ###############################################################################
#TYPE ZONE GATEWAYS GATEWAY #TYPE ZONE GATEWAY(S) GATEWAY
# ZONES # ZONE(S)

10
Shorewall6/manpages/shorewall6-tunnels.xml
View File

@ -120,9 +120,9 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">GATEWAY</emphasis>S - <term><emphasis role="bold">GATEWAY</emphasis>(S) (gateway or
<emphasis>address-or-range</emphasis> <emphasis role="bold">[ , ... gateways) - <emphasis>address-or-range</emphasis> <emphasis
]</emphasis></term> role="bold">[ , ... ]</emphasis></term>
<listitem> <listitem>
<para>The IP address of the remote tunnel gateway. If the remote <para>The IP address of the remote tunnel gateway. If the remote
@ -139,8 +139,8 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">GATEWAY ZONES</emphasis> (gateway_zone) - <term><emphasis role="bold">GATEWAY ZONE(S)</emphasis> (gateway_zone
[<emphasis>zone</emphasis>[<emphasis or gateway_zones) - [<emphasis>zone</emphasis>[<emphasis
role="bold">,</emphasis><emphasis>zone</emphasis>]...]</term> role="bold">,</emphasis><emphasis>zone</emphasis>]...]</term>
<listitem> <listitem>

10
docs/configuration_file_basics.xml
View File

@ -579,13 +579,15 @@ ACCEPT net:\
<row> <row>
<entry>ecn</entry> <entry>ecn</entry>
<entry>interface,hosts</entry> <entry>interface,hosts. Beginning with Shorewall 4.5.4, 'host' is
a synonym for 'hosts'.</entry>
</row> </row>
<row> <row>
<entry>hosts</entry> <entry>hosts</entry>
<entry>zone,hosts,options</entry> <entry>zone,hosts,options. Beginning with Shorewall 4.5.4, 'host'
is a synonym for 'hosts'.</entry>
</row> </row>
<row> <row>
@ -720,7 +722,9 @@ ACCEPT net:\
<entry>tunnels</entry> <entry>tunnels</entry>
<entry>type,zone,gateway,gateway_zone. Beginning with Shorewall <entry>type,zone,gateway,gateway_zone. Beginning with Shorewall
4.5.3, 'gateways' is a synonym for 'gateway'.</entry> 4.5.3, 'gateways' is a synonym for 'gateway'. Beginning with
Shorewall 4.5.4, 'gateway_zones' is a synonym for
'gateway_zone'.</entry>
</row> </row>
<row> <row>