projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
. Unbreak the key and fingerprint feature
[mirror/userdir-ldap.git]
/
ud-fingerserv
diff --git
a/ud-fingerserv
b/ud-fingerserv
index
6356d23
..
687a62c
100755
(executable)
--- a/
ud-fingerserv
+++ b/
ud-fingerserv
@@
-1,5
+1,5
@@
#!/usr/bin/perl
#!/usr/bin/perl
-# $Id: ud-fingerserv,v 1.1
5 2004/10/24 18:28:50
joey Exp $
+# $Id: ud-fingerserv,v 1.1
6 2004/10/24 18:34:12
joey Exp $
# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
@@
-25,13
+25,14
@@
my %attrs = (
'mn' => 'Middle name',
'sn' => 'Last name',
'email' => 'Email',
'mn' => 'Middle name',
'sn' => 'Last name',
'email' => 'Email',
- 'key
FingerP
rint' => 'Fingerprint',
+ 'key
fingerp
rint' => 'Fingerprint',
'key' => 'Key block',
'ircnick' => 'IRC nickname',
'key' => 'Key block',
'ircnick' => 'IRC nickname',
+ 'icquin' => 'ICQ UIN',
'labeleduri' => 'URL'
);
'labeleduri' => 'URL'
);
-my @summarykeys = ('cn', 'mn', 'sn', 'email', 'labeleduri', 'ircnick', '
keyFingerP
rint', 'key');
+my @summarykeys = ('cn', 'mn', 'sn', 'email', 'labeleduri', 'ircnick', '
icquin', 'keyfingerp
rint', 'key');
$SIG{__DIE__} = \&DieHandler;
$SIG{INT} = \&DieHandler;
$SIG{__DIE__} = \&DieHandler;
$SIG{INT} = \&DieHandler;
@@
-123,7
+124,7
@@
sub ProcessQuery {
$data = $entries->{$dn};
$data->{key} = [];
$data = $entries->{$dn};
$data->{key} = [];
- foreach (@{$data->{key
FingerP
rint}}) {
+ foreach (@{$data->{key
fingerp
rint}}) {
push (@{$data->{key}}, "\n".&Util::FetchKey($_));
}
push (@{$data->{key}}, "\n".&Util::FetchKey($_));
}
@@
-133,6
+134,10
@@
sub ProcessQuery {
$data->{email}->[0] =~ s/\s+/ /g;
$data->{email}->[0] =~ s/\s+/ /g;
+ for (my $i=0; $i <= $#{$data->{'keyfingerprint'}}; $i++) {
+ $data->{keyfingerprint}->[$i] = &Util::FormatFingerPrint($data->{keyfingerprint}->[$i]);
+ $data->{keyfingerprint}->[$i] =~ s, , ,;
+ }
print $client "$dn\n";
if (!$fields) {
foreach $key (@summarykeys) {
print $client "$dn\n";
if (!$fields) {
foreach $key (@summarykeys) {