Merge from sarge branch.

[software/mutt-debian.git] / debian / extra / lib / debian-ldap-query

diff --git a/debian/extra/lib/debian-ldap-query b/debian/extra/lib/debian-ldap-query
index c30c940ecba9351b23f5632befdc31e51cbcda54..f4e3ae494c866d857efe67b0d484f60cea7fe94f 100755 (executable)
--- a/debian/extra/lib/debian-ldap-query
+++ b/debian/extra/lib/debian-ldap-query
@@ -5,7 +5,7 @@
 
 use strict;
 
-my @attrs = qw(sn cn ircnick uid);
+my @attrs = qw(sn mn cn ircnick uid);
 my $base = 'ou=users, dc=debian, dc=org';
 my $server = 'db.debian.org';
 my $port = 389;
@@ -32,10 +32,12 @@ foreach my $search (@ARGV) {
        ) or die 'Failed search';
     foreach my $entry ($mesg->entries) {
                my $uid   = $entry->get_value('uid')    || next;
-               my $fname = $entry->get_value('cn')             || '';
-               my $lname = $entry->get_value('sn')             || '';
+               my $fname = $entry->get_value('cn')     || '';
+               my $mname = $entry->get_value('mn')     || '';
+               $mname .= ' ' if $mname;
+               my $lname = $entry->get_value('sn')     || '';
                my $nick  = $entry->get_value('ircnick')|| '';
-               push @results, "<$uid\@debian.org>\t$fname $lname\t($nick)\n";
+               push @results, "<$uid\@debian.org>\t$fname $mname$lname\t($nick)\n";
     }
 }