projects
/
mirror
/
userdir-ldap-cgi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
bbfdb58
..
41ebe25
100755
(executable)
--- a/
machines.cgi
+++ b/
machines.cgi
@@
-52,11
+52,12
@@
my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
%summaryattrs = ('hostname' => 'Host name',
'host' => 'just for a link',
'description' => 'Description',
%summaryattrs = ('hostname' => 'Host name',
'host' => 'just for a link',
'description' => 'Description',
+ 'architecture' => 'Architecture',
'status' => 'Status',
'access' => 'Access',
'sponsor' => 'Sponsor',
'purpose' => 'Purpose');
'status' => 'Status',
'access' => 'Access',
'sponsor' => 'Sponsor',
'purpose' => 'Purpose');
-@summaryorder = qw{hostname description sponsor purpose status access};
+@summaryorder = qw{hostname description
architecture
sponsor purpose status access};
%summarylistitems = map {$_=>1} qw{purpose sponsor};
# Global settings...
%summarylistitems = map {$_=>1} qw{purpose sponsor};
# Global settings...
@@
-74,7
+75,7
@@
sub sshfingerprint {
return '' if (!$key);
my @field = split(/ /, $key);
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]));
return '' unless $keytypes{$field[0]};
return '' if !$field[1];
my $fpr = md5_hex(decode_base64($field[1]));