# HG changeset patch # User heiko # Date 1216301950 0 # Node ID d443fd0ce9ea6bc62c0583d0f4c240930fbd8cba # Parent 9f182af87b850e182d74d04f25b7ef1bd5a6acab - cosmetical changes diff -r 9f182af87b85 -r d443fd0ce9ea update-mailboxes --- a/update-mailboxes Thu Jul 17 13:34:19 2008 +0000 +++ b/update-mailboxes Thu Jul 17 13:39:10 2008 +0000 @@ -12,14 +12,15 @@ use Pod::Usage; use if $ENV{DEBUG} => "Smart::Comments"; -my $ME = basename $0; -my $PRIVATE = "$ENV{HOME}/private/accounts"; -my $LDAPCONF = "/etc/ldap/ldap.conf"; -my $SERVER = "localhost"; -my $BLACKLIST = "/etc/mail/update-mailboxes.blacklist"; -my $OULIST = "/etc/mail/update-mailboxes.oulist"; -my $FILTER = "(&(objectClass=sambaSamAccount))"; -my $ATTR = ["uid"]; +my $ME = basename $0; +my $PRIVATE = "$ENV{HOME}/private/accounts"; +my $LDAPCONF = "/etc/ldap/ldap.conf"; +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; @@ -99,7 +100,7 @@ my $msg = $ldap->search( base => "$ou,$LDAPBASE", filter => $FILTER, - attrs => $ATTR, + attrs => [$MBOX_ATTR], ); push @entries, $msg->entries; }; @@ -112,7 +113,9 @@ my %mbox; foreach my $e (@entries) { - my $mbox = $e->get_value("uid") . "\@dtele.de"; + my $mbox = + $e->get_value($MBOX_ATTR) + . ($DEFAULT_DOMAIN ? "\@$DEFAULT_DOMAIN" : ""); if ($BLACK{$mbox}) { print "$mbox blacklisted\n";