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

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit f618a6ec3c1966824a18ae54eb845914afda337e
Merge: d02df5a5b91056f25063d30f5308fba1607615a2 c49b4a0e609eea856b2275ba11f7c34416252766
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 20 17:58:45 2009 +0100

    Merge branch 'upstream+repack' into debian-sid

diff --combined config/sources.php.dist
index ae62dce,4968da7..1f7d74c
--- a/config/sources.php.dist
+++ b/config/sources.php.dist
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  /**
-  * $Horde: turba/config/sources.php.dist,v 1.97.6.41 2009/08/05 21:06:10 jan Exp $
+  * $Horde: turba/config/sources.php.dist,v 1.97.6.41 2009-08-05 21:06:10 jan Exp $
   *
   * This file is where you specify the sources of contacts available to users
   * at your installation. It contains a large number of EXAMPLES. Please
@@@ -833,9 -833,6 +833,9 @@@ if (!empty($GLOBALS['conf']['imsp']['en
  
  /* 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 +869,11 @@@
                  '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