display all host keys, remove DSA key support

diff --git a/machines.cgi b/machines.cgi
index 92deede..938e330 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: machines.cgi,v 1.9 2001/01/08 07:03:23 tausq Exp $
+# $Id: machines.cgi,v 1.10 2001/12/03 05:02:13 rmurray Exp $
 
 # (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
 
@@ -27,8 +27,7 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder);
          'bandwidth' => 'Bandwidth',
          'status' => 'Status',
          'notes' => 'Notes',
-         'sshrsahostkey' => 'SSH host key (RSA)',
-         'sshdsahostkey' => 'SSH host key (DSA)',
+         'sshrsahostkey' => 'SSH host key',
          'description' => 'Description',
          'createtimestamp' => 'Entry created',
          'modifytimestamp' => 'Entry modified'
@@ -37,7 +36,7 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder);
 # This defines what fields are displayed, and in what order
 @attrorder = qw(hostname admin architecture distribution access
                 sponsor sponsor-admin location machine memory
-               disk bandwidth status notes sshrsahostkey sshdsahostkey
+               disk bandwidth status notes sshrsahostkey
                description createtimestamp modifytimestamp);
 
 # ditto for summary
@@ -97,6 +96,11 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
     # Format email addresses
     $output{admin} = sprintf("<a href=\"mailto:%s\">%s</a>", $output{admin}, $output{admin});
     $output{'sponsor-admin'} = sprintf("<a href=\"mailto:%s\">%s</a>", $output{'sponsor-admin'}, $output{'sponsor-admin'});
+
+    $output{sshrsahostkey} = undef;
+    foreach $key (@{$data->{sshrsahostkey}}) {
+      $output{sshrsahostkey} .= $key . "<br>";
+    }
     
     # URL
     my ($sponsor, $url) = undef;