Commit changes found on newsamosa (they break the system, though, but

[mirror/userdir-ldap.git] / ud-fingerserv

diff --git a/ud-fingerserv b/ud-fingerserv
index 7f33835..6356d23 100755 (executable)
--- a/ud-fingerserv
+++ b/ud-fingerserv
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: ud-fingerserv,v 1.13 1999/11/29 02:44:53 tausq Exp $
+# $Id: ud-fingerserv,v 1.15 2004/10/24 18:28:50 joey Exp $
 
 # (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
 
@@ -25,13 +25,13 @@ my %attrs = (
   'mn' => 'Middle name',
   'sn' => 'Last name',
   'email' => 'Email',
-  'keyfingerprint' => 'Fingerprint',
+  'keyFingerPrint' => 'Fingerprint',
   'key' => 'Key block',
   'ircnick' => 'IRC nickname',
-  'labeledurl' => 'URL'
+  'labeleduri' => 'URL'
 );
 
-my @summarykeys = ('cn', 'mn', 'sn', 'email', 'labeledurl', 'ircnick', 'keyfingerprint', 'key');
+my @summarykeys = ('cn', 'mn', 'sn', 'email', 'labeleduri', 'ircnick', 'keyFingerPrint', 'key');
 
 $SIG{__DIE__} = \&DieHandler;
 $SIG{INT} = \&DieHandler;
@@ -66,7 +66,7 @@ if (!$use_inetd) {
     my $hostinfo = gethostbyaddr($client->peeraddr, AF_INET);
     &log(sprintf("[Connect from %s]", $hostinfo || $client->peerhost));
     my $query = &readdata($client);
-    &ProcessQuery($client, $query);
+    &ProcessQuery($client, $query) if (defined($query));
     $client->close;
     exit;
   } continue {
@@ -78,7 +78,7 @@ if (!$use_inetd) {
   my ($port, $addr) = unpack_sockaddr_in(getpeername(STDIN));
   &log(sprintf("[Connect from %s (%s)]", gethostbyaddr($addr, AF_INET), inet_ntoa($addr)));
   my $query = &readdata(\*STDIN);
-  &ProcessQuery(\*STDOUT, $query);
+  &ProcessQuery(\*STDOUT, $query) if (defined($query));
   exit;
 }
 
@@ -123,7 +123,7 @@ sub ProcessQuery {
     $data = $entries->{$dn};
 
     $data->{key} = [];    
-    foreach (@{$data->{keyfingerprint}}) {
+    foreach (@{$data->{keyFingerPrint}}) {
       push (@{$data->{key}}, "\n".&Util::FetchKey($_));
     }
     
@@ -175,6 +175,7 @@ sub readdata {
   my $in = undef;
   my $out = undef;
   my $bytesread = 0;
+  my $ret;
 
   my $flags= fcntl($fh, F_GETFL, 0)
      or die "Can't get flags for socket: $!\n";
@@ -182,7 +183,9 @@ sub readdata {
      or die "Can't make socket nonblocking: $!\n";
                                                
   while (($bytesread < 1024) && ($out !~ /\n/)) {
-    $bytesread += sysread($fh, $in, 1024);
+    $ret = sysread($fh, $in, 1024);
+    return undef if (!defined($ret) || ($ret == 0));
+    $bytesread += $ret;
     $out .= $in;
   }