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] BUG11825: firewall: Renaming a network/host group doesn't
 update rules
Date: Fri, 24 Aug 2018 11:46:06 +0100
Message-ID: <1b56db782e38dc2aaaa007d58a1fb1009f69e72e.camel@ipfire.org>
In-Reply-To: <20180824080630.9612-1-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1951844895496637725=="
List-Id: <development.lists.ipfire.org>

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

Perfect. Merged!

On Fri, 2018-08-24 at 10:06 +0200, Alexander Marx wrote:
> Code only changed field 6 of hash (target group) and not field 4 (source gr=
oup).
> Also if using geoip it was only field 4 of hash (source group) and not fiel=
d 6 of hash (target group)
> Added new code that changes both fields to reflect the change in the firewa=
llrules immediately.
>=20
> fixes: #11825
>=20
> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> ---
>  html/cgi-bin/fwhosts.cgi | 2 ++
>  1 file changed, 2 insertions(+)
>=20
> diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
> index 576701ac6..7315e79b6 100644
> --- a/html/cgi-bin/fwhosts.cgi
> +++ b/html/cgi-bin/fwhosts.cgi
> @@ -1258,6 +1258,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegrpname')
>  			}
>  			&General::writehasharray("$configgrp", \%customgrp );
>  			#change name in FW Rules
> +			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4);
>  			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6);
>  		}
>  	}
> @@ -1282,6 +1283,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname')
>  			&General::writehasharray("$configgeoipgrp", \%customgeoipgrp );
>  			#change name in FW Rules
>  			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4,=
"geoip");
> +			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6,=
"geoip");
>  		}
>  	}
>  	&addgeoipgrp;


--===============1951844895496637725==--