lib/Kolab

[Jeroen van Meeuwen]

 lib/Kolab/LDAP.pm |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 91ab8dde621c3f7e737b8a050fb2f3868575bb35
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 2 12:49:28 2011 -0400

    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)

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