diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2011-05-02 16:49:28 (GMT) |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2011-05-02 16:49:28 (GMT) |
| commit | 91ab8dde621c3f7e737b8a050fb2f3868575bb35 (patch) | |
| tree | 7bf154586d9e9c60ae8f968b4977c4fcaf1ebeda /lib | |
| parent | d632ec4a02478ec3109a4a4160f6cd449c0a37e4 (diff) | |
| download | perl-Kolab-91ab8dde621c3f7e737b8a050fb2f3868575bb35.tar.gz | |
Use a configurable LDAP attribute to indicate the Kolab server used for the mailbox for this object, to comply with best practices based on the Netscape schema extensions (which use mailHost)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kolab/LDAP.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Kolab/LDAP.pm b/lib/Kolab/LDAP.pm index 50d5c4b..588a33f 100644 --- a/lib/Kolab/LDAP.pm +++ b/lib/Kolab/LDAP.pm @@ -458,17 +458,17 @@ sub createObject return unless $uid; return if( $objuidfield eq 'mail' && !$object->get_value('uid') ); - my $kolabhomeserver = lc($object->get_value('kolabhomeserver')); - my $kolabimapserver = lc($object->get_value('kolabimapserver')); + my $kolabhomeserver = lc($object->get_value($Kolab::config{'kolab_server_attribute'})); my $islocal = 1; my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1); + if( ref($del) eq 'ARRAY' && @$del > 0 ) { Kolab::log('L', "Kolab::LDAP::createObject() skipping object ".lc($object->get_value($objuidfield)) ." because it is deleted", KOLAB_DEBUG); return; } - if( ($kolabhomeserver && $kolabhomeserver ne lc($Kolab::config{'fqdnhostname'})) - || $kolabimapserver && $kolabimapserver ne lc(hostfqdn()) ) { + + if (($kolabhomeserver && $kolabhomeserver ne lc($Kolab::config{'fqdnhostname'}))) { # We are not on the home server if( $p eq 'sf' ) { # Dont create shared folders on other hosts than it's kolabhomeserver |