From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] 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.
Date: Thu, 05 Apr 2018 10:59:27 +0100
Message-ID: <1522922367.1009312.57.camel@ipfire.org>
In-Reply-To: <1522910196-7951-1-git-send-email-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4092539892259207520=="
List-Id: <development.lists.ipfire.org>

--===============4092539892259207520==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Please don't forget to update the bug report so that the people who are invol=
ved
see the patch and can test it.

Best,
-Michael

On Thu, 2018-04-05 at 08:36 +0200, Alexander Marx wrote:
> fixes: #11312
> ---
>  html/cgi-bin/fwhosts.cgi | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>=20
> diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
> index a2ade8a..c342d46 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=3Dshift;
>  	my $new=3Dshift;
>  	my $fld=3Dshift;
> +	my $type=3Dshift;
> +=09
> +	if ($type eq 'geoip'){
> +		$old=3D"group:$old";
> +		$new=3D"group:$new";
> +	}
>  	&General::readhasharray("$fwconfigfwd", \%fwfwd);
>  	&General::readhasharray("$fwconfiginp", \%fwinp);
>  	&General::readhasharray("$fwconfigout", \%fwout);

--===============4092539892259207520==--