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

Replace leading spaces with tabs

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6007 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-18 20:53:25 +00:00
parent ab755b41cd
commit ca7e844869
6 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-perl/Shorewall/Common.pm
View File

@ -55,7 +55,7 @@ our @EXPORT = qw(ALLIPv4
$command $command
$doing $doing
$done $done
$verbose $verbose
); );
our @EXPORT_OK = (); our @EXPORT_OK = ();
our @VERSION = 1.00; our @VERSION = 1.00;

42
Shorewall-perl/Shorewall/Config.pm
View File

@ -31,25 +31,25 @@ use File::Basename;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
our @EXPORT = qw( our @EXPORT = qw(
warning_message warning_message
fatal_error fatal_error
find_file find_file
split_line split_line
open_file open_file
close_file close_file
push_open push_open
pop_open pop_open
read_a_line read_a_line
get_configuration get_configuration
require_capability require_capability
report_capabilities report_capabilities
propagateconfig propagateconfig
append_file append_file
run_user_exit run_user_exit
generate_aux_config generate_aux_config
%config %config
%globals %globals
%capabilities ); %capabilities );
our @EXPORT_OK = (); our @EXPORT_OK = ();
our @VERSION = 1.00; our @VERSION = 1.00;
@ -67,7 +67,7 @@ our %globals = ( SHAREDIR => '/usr/share/shorewall' ,
# From shorewall.conf file # From shorewall.conf file
# #
our %config = our %config =
( STARTUP_ENABLED => undef, ( STARTUP_ENABLED => undef,
VERBOSITY => undef, VERBOSITY => undef,
# #
# Logging # Logging
@ -162,7 +162,7 @@ my @propagateenv = qw/ LOGLIMIT LOGTAGONLY LOGRULENUMBERS /;
# From parsing the capabilities file # From parsing the capabilities file
# #
our %capabilities = our %capabilities =
( NAT_ENABLED => undef, ( NAT_ENABLED => undef,
MANGLE_ENABLED => undef, MANGLE_ENABLED => undef,
MULTIPORT => undef, MULTIPORT => undef,
XMULTIPORT => undef, XMULTIPORT => undef,
@ -686,7 +686,7 @@ sub ensure_config_path( $ ) {
@config_path = split /:/, $config{CONFIG_PATH}; @config_path = split /:/, $config{CONFIG_PATH};
for ( @config_path ) { for ( @config_path ) {
$_ .= '/' unless m|//$|; $_ .= '/' unless m|//$|;
} }
if ( my $sd = $ENV{SHOREWALL_DIR} ) { if ( my $sd = $ENV{SHOREWALL_DIR} ) {

4
Shorewall-perl/Shorewall/Interfaces.pm
View File

@ -33,7 +33,7 @@ our @ISA = qw(Exporter);
our @EXPORT = qw( add_group_to_zone our @EXPORT = qw( add_group_to_zone
validate_interfaces_file validate_interfaces_file
known_interface known_interface
interface_is_optional interface_is_optional
find_interfaces_by_option find_interfaces_by_option
get_interface_option get_interface_option
@ -119,7 +119,7 @@ sub validate_interfaces_file()
{ {
use constant { SIMPLE_IF_OPTION => 1, use constant { SIMPLE_IF_OPTION => 1,
BINARY_IF_OPTION => 2, BINARY_IF_OPTION => 2,
ENUM_IF_OPTION => 3 }; ENUM_IF_OPTION => 3 };
my %validoptions = (arp_filter => BINARY_IF_OPTION, my %validoptions = (arp_filter => BINARY_IF_OPTION,
arp_ignore => ENUM_IF_OPTION, arp_ignore => ENUM_IF_OPTION,

30
Shorewall-perl/Shorewall/Nat.pm
View File

@ -45,30 +45,30 @@ my %addresses_to_add;
sub do_ipsec_options($) sub do_ipsec_options($)
{ {
my %validoptions = ( strict => NOTHING, my %validoptions = ( strict => NOTHING,
next => NOTHING, next => NOTHING,
reqid => NUMERIC, reqid => NUMERIC,
spi => NUMERIC, spi => NUMERIC,
proto => IPSECPROTO, proto => IPSECPROTO,
mode => IPSECMODE, mode => IPSECMODE,
"tunnel-src" => NETWORK, "tunnel-src" => NETWORK,
"tunnel-dst" => NETWORK, "tunnel-dst" => NETWORK,
); );
my $list=$_[0]; my $list=$_[0];
my $options = '-m policy'; my $options = '-m policy';
my $fmt; my $fmt;
for my $e ( split ',' , $list ) { for my $e ( split ',' , $list ) {
my $val = undef; my $val = undef;
my $invert = ''; my $invert = '';
if ( $e =~ /([\w-]+)!=(.+)/ ) { if ( $e =~ /([\w-]+)!=(.+)/ ) {
$val = $2; $val = $2;
$e = $1; $e = $1;
$invert = '! '; $invert = '! ';
} elsif ( $e =~ /([\w-]+)=(.+)/ ) { } elsif ( $e =~ /([\w-]+)=(.+)/ ) {
$val = $2; $val = $2;
$e = $1; $e = $1;
} }
$fmt = $validoptions{$e}; $fmt = $validoptions{$e};

6
Shorewall-perl/Shorewall/Rules.pm
View File

@ -721,9 +721,9 @@ sub setup_mac_lists( $ ) {
} }
$comment = ''; $comment = '';
# #
# Generate jumps from the input and forward chains # Generate jumps from the input and forward chains
# #
for my $hostref ( @$maclist_hosts ) { for my $hostref ( @$maclist_hosts ) {
my $interface = $hostref->[0]; my $interface = $hostref->[0];
my $ipsec = $hostref->[1]; my $ipsec = $hostref->[1];

16
Shorewall-perl/Shorewall/Zones.pm
View File

@ -114,14 +114,14 @@ our %interfaces;
sub parse_zone_option_list($) sub parse_zone_option_list($)
{ {
my %validoptions = ( mss => NUMERIC, my %validoptions = ( mss => NUMERIC,
strict => NOTHING, strict => NOTHING,
next => NOTHING, next => NOTHING,
reqid => NUMERIC, reqid => NUMERIC,
spi => NUMERIC, spi => NUMERIC,
proto => IPSECPROTO, proto => IPSECPROTO,
mode => IPSECMODE, mode => IPSECMODE,
"tunnel-src" => NETWORK, "tunnel-src" => NETWORK,
"tunnel-dst" => NETWORK, "tunnel-dst" => NETWORK,
); );
# #