[pkg-horde] [SCM] Debian Horde Packages repository: turba2 package branch, debian-sid, updated. 34f202faaca85344c41f14b10ff380ebe2232d7d

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit 34f202faaca85344c41f14b10ff380ebe2232d7d
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 20 18:53:39 2009 +0100

    Revert "When using Kolab, other sources are removed"
    
    This reverts commit f5af772ebf0ad63c06213426a789711e918740a4.

diff --git a/config/sources.php.dist b/config/sources.php.dist
index 1f7d74c..4968da7 100644
--- a/config/sources.php.dist
+++ b/config/sources.php.dist
@@ -833,9 +833,6 @@ if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 
 /* Begin Kolab sources. */
 if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
-    // When using Kolab, other sources are removed
-    $cfgSources = Array();
-    
 
     /* Only use LDAP if we have that extension in PHP */
     if (function_exists('ldap_connect')) {
@@ -869,11 +866,9 @@ if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
                 'version' => 3,
                 'bind_dn' => '',
                 'bind_password' => '',
-                'read_only' => true,
             ),
             'map' => array(
                 '__key'             => 'dn',
-                '__uid'             => 'dn',
                 'name'              => 'cn',
                 'firstname'         => 'givenName',
                 'lastname'          => 'sn',

-- 
Debian Horde Packages repository: turba2 package