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 [thread overview]
Message-ID: <51E3B9E9-4B18-4E67-8484-7BC5859B57D9@ipfire.org> (raw)
In-Reply-To: <trinity-27870ff7-5e8c-4923-a575-41117857fda7-1559643840434@3c-app-gmx-bs71>
[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]
Hello,
I merged this patch.
I had to spend a little time to figure out what you actually wanted to achieve here. It would have helped to add to the commit message that the expected behaviour just wasn’t programmed into the file and that this patch now changes that.
I updated the commit message for your future reference. Please read through that 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:
>
> Save fixed leases to file after addition of a new lease
>
> Signed-off-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
>
> ---
> html/cgi-bin/dhcp.cgi | 3 +++
> 1 file changed, 3 insertions(+)
>
> 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'} = &Header::cleanhtml($dhcpsettings{'FIX_ROOTPATH'});
> if ($dhcpsettings{'KEY2'} eq '') { #add or edit ?
> unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_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'});
>
> # Enter edit mode
> --
> 2.21.0.windows.1
>
next prev parent reply other threads:[~2019-06-05 9:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-04 10:24 Bernhard Bitsch
2019-06-04 12:33 ` Michael Tremer
2019-06-04 12:45 ` Aw: " Bernhard Bitsch
2019-06-05 9:05 ` Michael Tremer [this message]
2019-06-05 11:13 ` Bernhard Bitsch
2019-06-05 12:06 ` Michael Tremer
2019-06-05 13:10 ` Aw: " Bernhard Bitsch
2019-06-05 13:26 ` Michael Tremer
2019-06-05 14:03 ` Aw: " Bernhard Bitsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51E3B9E9-4B18-4E67-8484-7BC5859B57D9@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox