X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=ba84f18232e745d554af1011a3591f031de9738a;hb=3462d73faa40c0aa33a028a2e92a14fa8f3824ec;hp=4108fff7d932d1d43768140c1a12c99f2472dcf0;hpb=55211520385add2b5f3a2d0a61bdc9f615830f87;p=mirror%2Fuserdir-ldap-cgi.git diff --git a/machines.cgi b/machines.cgi index 4108fff..ba84f18 100755 --- a/machines.cgi +++ b/machines.cgi @@ -11,7 +11,7 @@ use strict vars; #use Apache::Registry; use CGI; use Util; -use Net::LDAP qw(:all); +use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR); use Fcntl; use POSIX; use MIME::Base64; @@ -74,7 +74,8 @@ sub sshfingerprint { return '' if (!$key); my @field = split(/ /, $key); - return '' if $field[0] ne 'ssh-dss' and $field[0] ne 'ssh-rsa'; + my %keytypes = map {$_=>1} (qw{ssh-dss ssh-rsa ecdsa-sha2-nistp256}); + return '' unless $keytypes{$field[0]}; return '' if !$field[1]; my $fpr = md5_hex(decode_base64($field[1])); my $hrfpr = $field[0] . " " . substr($fpr,0,2,""); @@ -210,7 +211,7 @@ if ($output{havehostdata}) { } else { # display summary info $hostdetails = "

Summary

\n"; - $hostdetails .= "\n"; + $hostdetails .= "
\n"; foreach $key (@summaryorder) { if ($sortby ne $key) { $hostdetails .= "";
$summaryattrs{$key}