From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernhard Bitsch To: development@lists.ipfire.org Subject: Re: [PATCH] header.pl: Fix parsing BOOTP leases Date: Mon, 20 May 2024 12:00:07 +0200 Message-ID: <9ac85b57-f5a8-4b8a-969d-fba8d9a26a81@ipfire.org> In-Reply-To: <20240515132003.1788345-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5629208198923794444==" List-Id: --===============5629208198923794444== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bernhard Bitsch Am 15.05.2024 um 15:20 schrieb Michael Tremer: > 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. >=20 > Fixes: #13689 - BOOTP breaks the list of DHCP leases due to erroneous parsi= ng > Signed-off-by: Michael Tremer > --- > config/cfgroot/header.pl | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) >=20 > 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 localt= ime($endtime); > $endtime_print =3D sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1= ,$year+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/) { --===============5629208198923794444==--