[pkg-horde] [SCM] Debian Horde Packages repository: turba2 package branch, upstream+patches, updated. 33ebd0ab67887177d939876bffab30763e6a7d0c

[Mathieu Parent]

The following commit has been merged in the upstream+patches branch:
commit 33ebd0ab67887177d939876bffab30763e6a7d0c
Merge: 3960227cad936dbb62d3d6dd7e429b8246beba94 86c4181f957c9c3999b77f21421443baca4a9133
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 20 17:41:49 2009 +0100

    Merge branch 'upstream' into upstream+patches

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