michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Also exclude leases that have replacements https://sourceforge.net/p/webadmin/bugs/5225/

Browse Source
This commit is contained in:
Jamie Cameron
2018-12-28 16:45:41 -08:00
parent f0046765a4
commit 3c2be83ea0
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dhcpd/list_leases.cgi
View File

@@ -82,6 +82,20 @@ else {
push(@leases, $lease);
}
# Find leases which have been obsoleted by a more recent one, even if
# they are still valid
my %already;
foreach my $l (reverse(@leases)) {
my $client = &find('client-hostname', $l->{'members'});
my $ch = $client ? $client->{'values'}->[0] : undef;
if ($already{$l->{'values'}->[0],$ch}++) {
$l->{'obsolete'} = 1;
}
}
if (!$in{'all'}) {
@leases = grep { !$_->{'obsolete'} } @leases;
}
# Show links to select mode, if not showing a single subnet
if (!$in{'network'}) {
@links = ( );
@@ -191,7 +205,8 @@ else {
local $mems = $lease->{'members'};
local $starts = &find('starts', $mems);
local $ends = &find('ends', $mems);
local $ht = $lease->{'expired'} ? "i" : "tt";
local $ht = $lease->{'expired'} ||
$lease->{'obsolete'} ? "i" : "tt";
push(@cols, "<$ht>$lease->{'values'}->[0]</$ht>");
local $hard = &find('hardware', $mems);
push(@cols,$hard->{'values'}->[1] ?