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

Back out last unnecessary change

Browse Source
This commit is contained in:
Tom Eastep 2009-10-14 07:13:52 -07:00
parent 94d039bf56
commit 19a90db09f
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Shorewall/Perl/Shorewall/Nat.pm
View File

@ -35,7 +35,7 @@ use strict;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
our @EXPORT = qw( setup_masq setup_nat setup_netmap add_addresses ); our @EXPORT = qw( setup_masq setup_nat setup_netmap add_addresses );
our @EXPORT_OK = qw(delete_addresses); our @EXPORT_OK = ();
our $VERSION = '4.4_3'; our $VERSION = '4.4_3';
our @addresses_to_add; our @addresses_to_add;
@ -500,25 +500,4 @@ sub add_addresses () {
} }
} }
sub delete_addresses () {
if ( @addresses_to_add ) {
unless ( $config{RETAIN_ALIASES} ) {
my @addrs = @addresses_to_add;
emit '';
while ( @addrs ) {
my $addr = shift @addrs;
my $interface = shift @addrs;
$interface =~ s/:.*//;
emit "del_ip_addr $addr $interface";
}
emit '';
}
}
}
1; 1;

3
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -31,7 +31,6 @@ use Shorewall::Chains qw(:DEFAULT :internal);
use Shorewall::Actions; use Shorewall::Actions;
use Shorewall::Policy; use Shorewall::Policy;
use Shorewall::Proc; use Shorewall::Proc;
use Shorewall::Nat qw(delete_addresses);
use strict; use strict;
@ -2228,8 +2227,6 @@ EOF
emit 'delete_tc1' if $config{CLEAR_TC}; emit 'delete_tc1' if $config{CLEAR_TC};
delete_addresses;
emit( 'undo_routing', emit( 'undo_routing',
'restore_default_route' 'restore_default_route'
); );