Attachment 5191 Details for Bug 12883 – updated patch

[patch] updated patch

gw.diff (text/plain), 1.09 KB, created by Thierry Vignaud on 2014-06-11 17:59:07 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2014-06-11 17:59:07 CEST

Size: 1.09 KB

patch

obsolete

>diff --git a/bin/drakgw b/bin/drakgw
>index 76532bd..c710022 100755
>--- a/bin/drakgw
>+++ b/bin/drakgw
>@@ -125,6 +125,9 @@ What would you like to do?"); #- FIXME : not used for now
> 	      data => [ { label => N("Net Device"), val => \$shorewall->{masq}{net_interface}, list => [ sort keys %{$net->{ifcfg}} ], format => sub { network::tools::get_interface_description($net, $_[0]) } } ],
> 	      post => sub {
> 		  network::shorewall::add_interface_to_net_zone($shorewall, $shorewall->{masq}{net_interface});
>+		  my $if = $shorewall->{masq}{net_interface};
>+		  # filter out net interface
>+		  $shorewall->{loc_zone} = [ grep { $_ ne $if } @{$shorewall->{loc_zone}} ];
> 		  # if loc_zone is unconfigured and has no interfaces, have all interfaces be local (except the chosen net interface)
>-		  $shorewall->{loc_zone} = [ sort grep {!/^$shorewall->{masq}{net_interface}$/} keys %{$net->{ifcfg}} ] if scalar(@{$shorewall->{loc_zone}}) == 0;
>+		  $shorewall->{loc_zone} = [ sort grep { $_ ne $if } keys %{$net->{ifcfg}} ] if scalar(@{$shorewall->{loc_zone}}) == 0;
> 		  my $locals = @{$shorewall->{loc_zone}};

diff --git a/bin/drakgw b/bin/drakgw
index 76532bd..c710022 100755
--- a/bin/drakgw
+++ b/bin/drakgw
@@ -125,6 +125,9 @@ What would you like to do?"); #- FIXME : not used for now
 	      data => [ { label => N("Net Device"), val => \$shorewall->{masq}{net_interface}, list => [ sort keys %{$net->{ifcfg}} ], format => sub { network::tools::get_interface_description($net, $_[0]) } } ],
 	      post => sub {
 		  network::shorewall::add_interface_to_net_zone($shorewall, $shorewall->{masq}{net_interface});
+		  my $if = $shorewall->{masq}{net_interface};
+		  # filter out net interface
+		  $shorewall->{loc_zone} = [ grep { $_ ne $if } @{$shorewall->{loc_zone}} ];
 		  # if loc_zone is unconfigured and has no interfaces, have all interfaces be local (except the chosen net interface)
-		  $shorewall->{loc_zone} = [ sort grep {!/^$shorewall->{masq}{net_interface}$/} keys %{$net->{ifcfg}} ] if scalar(@{$shorewall->{loc_zone}}) == 0;
+		  $shorewall->{loc_zone} = [ sort grep { $_ ne $if } keys %{$net->{ifcfg}} ] if scalar(@{$shorewall->{loc_zone}}) == 0;
 		  my $locals = @{$shorewall->{loc_zone}};

Actions: View | Diff

Attachments on bug 12883: 5019 | 5088 | 5190 | 5191