BUG:11312 When renaming a GeoIP Group, the corresponding names in firewallrules (if any) are not changed accordingly. Now when changing a GeoIP Group the firewallrules are renamed correctly.

BUG:11312 When renaming a GeoIP Group, the corresponding names in firewallrules (if any) are not changed accordingly. Now when changing a GeoIP Group the firewallrules are renamed correctly.

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1314 bytes --]

Slightly improved first version of this patch (contained
a blank line with trailing whitespace). No functionality
changed, patch has been confirmed as working correctly.

Fixes: #11312
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
 html/cgi-bin/fwhosts.cgi | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index a2ade8a20..10217425d 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1278,7 +1278,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname')
 			}
 			&General::writehasharray("$configgeoipgrp", \%customgeoipgrp );
 			#change name in FW Rules
-			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6);
+			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4,"geoip");
 		}
 	}
 	&addgeoipgrp;
@@ -3052,6 +3052,12 @@ sub changenameinfw
 	my $old=shift;
 	my $new=shift;
 	my $fld=shift;
+	my $type=shift;
+
+	if ($type eq 'geoip'){
+		$old="group:$old";
+		$new="group:$new";
+	}
 	&General::readhasharray("$fwconfigfwd", \%fwfwd);
 	&General::readhasharray("$fwconfiginp", \%fwinp);
 	&General::readhasharray("$fwconfigout", \%fwout);
-- 
2.13.6

Re: BUG:11312 When renaming a GeoIP Group, the corresponding names in firewallrules (if any) are not changed accordingly. Now when changing a GeoIP Group the firewallrules are renamed correctly.

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1469 bytes --]

Merged, but please don't do subject lines of that length again :)

On Thu, 2018-04-26 at 17:31 +0200, Peter Müller wrote:
> Slightly improved first version of this patch (contained
> a blank line with trailing whitespace). No functionality
> changed, patch has been confirmed as working correctly.
> 
> Fixes: #11312
> Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> ---
>  html/cgi-bin/fwhosts.cgi | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
> index a2ade8a20..10217425d 100644
> --- a/html/cgi-bin/fwhosts.cgi
> +++ b/html/cgi-bin/fwhosts.cgi
> @@ -1278,7 +1278,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname')
>  			}
>  			&General::writehasharray("$configgeoipgrp",
> \%customgeoipgrp );
>  			#change name in FW Rules
> -			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhost
> settings{'grp'},6);
> +			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhost
> settings{'grp'},4,"geoip");
>  		}
>  	}
>  	&addgeoipgrp;
> @@ -3052,6 +3052,12 @@ sub changenameinfw
>  	my $old=shift;
>  	my $new=shift;
>  	my $fld=shift;
> +	my $type=shift;
> +
> +	if ($type eq 'geoip'){
> +		$old="group:$old";
> +		$new="group:$new";
> +	}
>  	&General::readhasharray("$fwconfigfwd", \%fwfwd);
>  	&General::readhasharray("$fwconfiginp", \%fwinp);
>  	&General::readhasharray("$fwconfigout", \%fwout);