|
|
|
@ -314,6 +314,11 @@ DOMAIN: foreach my $domain ( keys $conf->{domains} ) { |
|
|
|
|
# or which exist in both but need to be updated |
|
|
|
|
foreach my $user ( keys $ext_users ) { |
|
|
|
|
my $attrs = ''; |
|
|
|
|
# Ignore admin |
|
|
|
|
if ( $user eq 'admin' ) { |
|
|
|
|
log_verbose( "Skiping admin user"); |
|
|
|
|
next; |
|
|
|
|
} |
|
|
|
|
if ( defined $zim_users->{$user} ) { |
|
|
|
|
|
|
|
|
|
# User exists in Zimbra, lets check its attribute are up to date |
|
|
|
@ -819,7 +824,7 @@ sub zim_attr_value { |
|
|
|
|
|
|
|
|
|
# Take an alias and a domain. Return 1 if the alias is member of this domain (or one of the domain aliases) |
|
|
|
|
sub alias_matches_domain { |
|
|
|
|
my $alias = shift; |
|
|
|
|
my $alias = shift; |
|
|
|
|
my $domain = shift; |
|
|
|
|
return 1 if ( $alias =~ m/\@$domain->{zimbraDomainName}$/ ); |
|
|
|
|
foreach my $dom ( @{ $domain->{zimbraDomainAliases} } ) { |
|
|
|
|