#!/usr/bin/perl
-# $Id: ud-fingerserv,v 1.5 1999/10/16 21:50:52 tausq Exp $
+# $Id: ud-fingerserv,v 1.8 1999/10/17 02:01:28 tausq Exp $
# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
-use lib '/home/randolph/projects/userdir-ldap/web';
+use lib '/var/www/userdir-ldap/';
use strict vars;
#use Apache::Registry;
use IO::Handle;
# Global settings...
my %config = &Util::ReadConfigFile;
my %opts;
-getopts("iqh", \%opts);
+getopts("iqhv", \%opts);
my $use_inetd = $config{use_inetd} || $opts{i};
$| = 1;
'cn' => 'First name',
'mn' => 'Middle name',
'sn' => 'Last name',
+ 'email' => 'Email',
'keyfingerprint' => 'Fingerprint',
'key' => 'Key block',
'ircnick' => 'IRC nickname'
);
-my @summarykeys = ('cn', 'mn', 'sn', 'ircnick', 'keyfingerprint', 'key');
+my @summarykeys = ('cn', 'mn', 'sn', 'email', 'ircnick', 'keyfingerprint', 'key');
$SIG{__DIE__} = \&DieHandler;
$SIG{INT} = \&DieHandler;
my $ldap = Net::LDAP->new($config{ldaphost}) || die $1;
$ldap->bind;
-if ($use_inetd == 0) {
+if (!$use_inetd) {
&log("Binding to port 79") if (defined($opts{v}));
my $server = IO::Socket::INET->new(Proto => 'tcp',
LocalPort => 'finger(79)',
foreach (@{$data->{keyfingerprint}}) {
push (@{$data->{key}}, "\n".&Util::FetchKey($_));
}
+
+ $data->{email}->[0] = sprintf("%s %s %s <%s>", $data->{cn}->[0],
+ $data->{mn}->[0], $data->{sn}->[0],
+ $data->{uid}->[0]."\@$config{emailappend}");
+
+ $data->{email}->[0] =~ s/\s+/ /g;
print $client "$dn\n";
if (!$fields) {