2 commits - lib/kolab_sync.php

[Jeroen van Meeuwen]

 lib/kolab_sync.php |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit fbedeffd530a6a787be49bcc454722f4dbb6bbe8
Merge: 4fe70fd 9940509
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Sep 27 10:21:47 2012 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-syncroton



commit 4fe70fdb359de2a065016ee3bfbfa46cbd2e122f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Sep 27 10:20:34 2012 +0100

    Load the kolab_auth configuration as needed, warn about unset (required) configuration values

diff --git a/lib/kolab_sync.php b/lib/kolab_sync.php
index 9bae2a1..da54283 100644
--- a/lib/kolab_sync.php
+++ b/lib/kolab_sync.php
@@ -159,6 +159,8 @@ class kolab_sync extends rcube
      */
     private function get_ldap_user($username, $host)
     {
+        @include_once(RCMAIL_CONFIG_DIR . "/kolab_auth.inc.php");
+
         $login_attr  = $this->config->get('kolab_auth_login');
         $addressbook = $this->config->get('kolab_auth_addressbook');
         $filter      = $this->config->get('kolab_auth_filter');
@@ -170,10 +172,12 @@ class kolab_sync extends rcube
         }
 
         if (empty($addressbook)) {
+            $this->logger->warn("No address book configured to authenticate the user.");
             return null;
         }
 
         if (empty($login_attr)) {
+            $this->logger->warn("No login attribute configured.");
             return null;
         }