Allow dashes in hostnames for sudo passwords (RT #5785)

[mirror/userdir-ldap-cgi.git] / machines.cgi

diff --git a/machines.cgi b/machines.cgi
index 98567ec..41ebe25 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -51,12 +51,13 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
 # ditto for summary
 %summaryattrs = ('hostname' => 'Host name',
                 'host'     => 'just for a link',
+                'description' => 'Description',
                 'architecture' => 'Architecture',
                 'status' => 'Status',
                 'access' => 'Access',
                 'sponsor' => 'Sponsor',
                 'purpose' => 'Purpose');
-@summaryorder = qw{hostname architecture sponsor purpose status access};
+@summaryorder = qw{hostname description architecture sponsor purpose status access};
 %summarylistitems = map {$_=>1} qw{purpose sponsor};
 
 # Global settings...
@@ -74,7 +75,7 @@ sub sshfingerprint {
     return '' if (!$key);
 
     my @field = split(/ /, $key);
-    my %keytypes = map {$_=>1} (qw{ssh-dss ssh-rsa ecdsa-sha2-nistp256});
+    my %keytypes = map {$_=>1} (qw{ssh-dss ssh-rsa ecdsa-sha2-nistp256 ssh-ed25519});
     return '' unless $keytypes{$field[0]};
     return '' if !$field[1];
     my $fpr = md5_hex(decode_base64($field[1]));
@@ -205,7 +206,7 @@ if ($output{havehostdata}) {
   $hostdetails .= "<ul>\n";
   foreach $key (@attrorder) {
     if ($output{$key}) {
-      $hostdetails .= "<li><b>$attrs{$key}:</b>$output{$key}\n";
+      $hostdetails .= "<li><b>$attrs{$key}</b>: $output{$key}\n";
     }
   }
   $hostdetails .= "</ul>\n";