From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] header.pl: Fix parsing BOOTP leases Date: Wed, 15 May 2024 13:20:03 +0000 Message-ID: <20240515132003.1788345-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4096969897851655095==" List-Id: --===============4096969897851655095== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable If the lease has been handed out over BOOTP, it will never expire. However, the parser did not account for this case at all which is fixed in this patch. Fixes: #13689 - BOOTP breaks the list of DHCP leases due to erroneous parsing Signed-off-by: Michael Tremer --- config/cfgroot/header.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 5164e9731..a67ff92ee 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -454,12 +454,16 @@ END $hostname =3D ""; } =20 - if ($line =3D~ /^\s*ends/) { - $line =3D~ /(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/; + if ($line =3D~ /^\s*ends \d (\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/) { $endtime =3D timegm($6, $5, $4, $3, $2 - 1, $1 - 1900); ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) =3D localtime= ($endtime); $endtime_print =3D sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$y= ear+1900,$hour,$min,$sec); $expired =3D $endtime < time(); + + } elsif ($line =3D~ /^\s*ends never/) { + $endtime =3D 0; + $endtime_print =3D $Lang::tr{'never'}; + $expired =3D 0; } =20 if ($line =3D~ /^\s*hardware ethernet/) { --=20 2.39.2 --===============4096969897851655095==--