--- a/update-mailboxes	Wed Apr 08 11:10:26 2009 +0200
+++ b/update-mailboxes	Wed Apr 08 11:13:04 2009 +0200
@@ -18,6 +18,9 @@
 my $SERVER    = "localhost";
 my $BLACKLIST = "/etc/mail/update-mailboxes.blacklist";
 my $OULIST    = "/etc/mail/update-mailboxes.oulist";
+my $FILTER         = "(&(objectClass=sambaSamAccount))";
+my $MBOX_ATTR      = "uid";
+my $DEFAULT_DOMAIN = "dtele.de";
 
 my $opt_delete   = 0;
 my $opt_protocol = undef;
@@ -94,8 +97,8 @@
             eval {
                 my $msg = $ldap->search(
                     base   => "$ou,$LDAPBASE",
-                    filter => "(&(samAccountName=*))",
-                    attrs  => ["samAccountName"],
+                    filter => $FILTER,
+                    attrs  => [$MBOX_ATTR],
                 );
                 push @entries, $msg->entries;
             };
@@ -108,7 +111,9 @@
     my %mbox;
     foreach my $e (@entries) {
 
-        my $mbox = $e->get_value("samAccountName");
+        my $mbox =
+          lc ($e->get_value($MBOX_ATTR)
+          . ($DEFAULT_DOMAIN ? "\@$DEFAULT_DOMAIN" : ""));
 
         if ($BLACK{$mbox}) {
             print "$mbox blacklisted\n";