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

Issue 'Processing...' message before first call to 'split_line()'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6307 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-09 19:05:27 +00:00
parent cba2f947e9
commit 1397af57fb
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,13 +59,13 @@ sub validate_hosts_file()
while ( read_a_line ) { while ( read_a_line ) {
my ($zone, $hosts, $options ) = split_line 2, 3, 'hosts file';
if ( $first_entry ) { if ( $first_entry ) {
progress_message2 "$doing $fn..."; progress_message2 "$doing $fn...";
$first_entry = 0; $first_entry = 0;
} }
my ($zone, $hosts, $options ) = split_line 2, 3, 'hosts file';
my $zoneref = $zones{$zone}; my $zoneref = $zones{$zone};
my $type = $zoneref->{type}; my $type = $zoneref->{type};

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

@ -181,14 +181,14 @@ sub validate_interfaces_file()
while ( read_a_line ) { while ( read_a_line ) {
my ($zone, $interface, $networks, $options ) = split_line 2, 4, 'interfaces file';
my $zoneref;
if ( $first_entry ) { if ( $first_entry ) {
progress_message2 "$doing $fn..."; progress_message2 "$doing $fn...";
$first_entry = 0; $first_entry = 0;
} }
my ($zone, $interface, $networks, $options ) = split_line 2, 4, 'interfaces file';
my $zoneref;
if ( $zone eq '-' ) { if ( $zone eq '-' ) {
$zone = ''; $zone = '';
} else { } else {

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

@ -135,13 +135,13 @@ sub validate_policy()
while ( read_a_line ) { while ( read_a_line ) {
my ( $client, $server, $policy, $loglevel, $synparams ) = split_line 3, 5, 'policy file';
if ( $first_entry ) { if ( $first_entry ) {
progress_message2 "$doing $fn..."; progress_message2 "$doing $fn...";
$first_entry = 0; $first_entry = 0;
} }
my ( $client, $server, $policy, $loglevel, $synparams ) = split_line 3, 5, 'policy file';
$loglevel = '' if $loglevel eq '-'; $loglevel = '' if $loglevel eq '-';
$synparams = '' if $synparams eq '-'; $synparams = '' if $synparams eq '-';

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

@ -195,15 +195,15 @@ sub determine_zones()
while ( read_a_line ) { while ( read_a_line ) {
my @parents;
my ($zone, $type, $options, $in_options, $out_options ) = split_line 1, 5, 'zones file';
if ( $first_entry ) { if ( $first_entry ) {
progress_message2 "$doing $fn..."; progress_message2 "$doing $fn...";
$first_entry = 0; $first_entry = 0;
} }
my @parents;
my ($zone, $type, $options, $in_options, $out_options ) = split_line 1, 5, 'zones file';
if ( $zone =~ /(\w+):([\w,]+)/ ) { if ( $zone =~ /(\w+):([\w,]+)/ ) {
$zone = $1; $zone = $1;
@parents = split ',', $2; @parents = split ',', $2;