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] dhcp.cgi: Fix for bug #12050
Date: Wed, 05 Jun 2019 10:05:09 +0100
Message-ID: <51E3B9E9-4B18-4E67-8484-7BC5859B57D9@ipfire.org>
In-Reply-To:
 <trinity-27870ff7-5e8c-4923-a575-41117857fda7-1559643840434@3c-app-gmx-bs71>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6328905533120518891=="
List-Id: <development.lists.ipfire.org>

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

Hello,

I merged this patch.

I had to spend a little time to figure out what you actually wanted to achiev=
e here. It would have helped to add to the commit message that the expected b=
ehaviour just wasn=E2=80=99t programmed into the file and that this patch now=
 changes that.

I updated the commit message for your future reference. Please read through t=
hat and take some inspiration from that with your next patch.

I am happy that we can finally close this bug.

Best,
-Michael

> On 4 Jun 2019, at 11:24, Bernhard Bitsch <Bernhard.Bitsch(a)gmx.de> wrote:
>=20
> Save fixed leases to file after addition of a new lease
>=20
> Signed-off-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
>=20
> ---
> html/cgi-bin/dhcp.cgi | 3 +++
> 1 file changed, 3 insertions(+)
>=20
> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
> index 675d80012..19c55eb6d 100644
> --- a/html/cgi-bin/dhcp.cgi
> +++ b/html/cgi-bin/dhcp.cgi
> @@ -443,6 +443,9 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') {
> 	$dhcpsettings{'FIX_ROOTPATH'} =3D &Header::cleanhtml($dhcpsettings{'FIX_RO=
OTPATH'});
> 	if ($dhcpsettings{'KEY2'} eq '') { #add or edit ?
> 	    unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'=
},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'F=
IX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n");
> +	    open(FILE, ">$filename2") or die 'Unable to open fixed lease file.';
> +	    print FILE @current2;
> +	    close(FILE);
> 	    &General::log($Lang::tr{'fixed ip lease added'});
>=20
> 	    # Enter edit mode
> --
> 2.21.0.windows.1
>=20


--===============6328905533120518891==--