[pkg-horde] [SCM] Debian Horde Packages repository: turba2 package branch, debian-sid, updated. 19a6bd2400ed37df35ca3bc6549202bb282b563f
Gregory Colpart
reg at foulademer.gcolpart.com
Tue Oct 20 23:56:50 UTC 2009
The following commit has been merged in the debian-sid branch:
commit 1b0485979995290369620f7df6602def0604b34b
Merge: 66a46f3d676451f8b51f2648ade0e41b533d06d5 dcb2ca7d96722cf1a4e233d232482e0034c1501b
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date: Wed Oct 21 01:50:38 2009 +0200
Merge branch 'upstream' into debian-sid
diff --combined config/sources.php.dist
index bf8ab52,d0913e6..ae62dce
--- 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.38 2008/11/12 06:29:26 wrobel 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
@@@ -60,16 -60,46 +60,46 @@@
* dn: Only applies to LDAP servers. Defines the list of LDAP
* attributes that build a valid DN.
*
+ * root: Only applies to LDAP servers. Defines the base DN where to
+ * start the search, i.e. dc=example,dc=com.
+ *
+ * bind_dn: Only applies to LDAP servers which do not allow anonymous
+ * connections. Active Directory servers do not allow it by
+ * default, so before using one as a Turba source, you must
+ * create a "rightless" user, which is only allowed to connect
+ * to the server, and set the bind_dn parameter like
+ * 'rightless at example.com' (not cn=rightless,dc=example,dc=com)
+ *
+ * bind_password: Only applies to LDAP servers which do not allow anonymous
+ * connection. You should set this to the cleartext password
+ * for the user specified in 'bind_dn'.
+ *
+ * referrals: Only applies to LDAP servers. If set, should be 0 or 1.
+ * See the LDAP documentation about the corresponding
+ * parameter REFERRALS. Windows 2003 Server requires that you
+ * set this parameter to 0.
+ *
+ * sizelimit: Only applies to LDAP servers. If set, limit the search to
+ * the specified number of entries. Value 0 or no value means
+ * no limit. Keep in mind that servers can impose their own
+ * search limits.
+ *
* objectclass: Only applies to LDAP servers. Defines a list of
- * objectclasses that contacts must belong to, and
- * that new objects will be created with.
+ * objectclasses that contacts must belong to, and that new
+ * objects will be created with.
*
* filter: Filter helps to filter your result based on certain
* condition in SQL and LDAP backends. A filter can be
* specified to avoid some unwanted data. For example, if the
* source is an external sql database, to select records with
- * the delete flag = 0:
- * 'filter' = 'deleted=0'
+ * the delete flag = 0: 'filter' => 'deleted=0'.
+ * Don't enclose filter in brackets - this will done
+ * automatically. Also keep in mind that a full filter line
+ * will be built from 'filter' and 'objectclass' parameters.
+ *
+ * version: Only applies to LDAP servers. If set, specify LDAP server
+ * version, can be 2 or 3. Active Directory servers
+ * require version 3.
*
* map: This is a list of mappings from the Turba attribute names (on
* the left) to the attribute names by which they are known in
@@@ -294,8 -324,12 +324,12 @@@ $cfgSources['localsql'] = array
// 'tls' => false,
// 'root' => 'dc=example,dc=com',
// 'bind_dn' => 'cn=admin,ou=users,dc=example,dc=com',
+ // // For Active Directory:
+ // // 'bind_dn' => 'username at example.com',
// 'bind_password' => '********',
// 'sizelimit' => 200,
+ // // For Active Directory:
+ // // 'sizelimit' => 0,
// 'dn' => array('cn'),
// 'objectclass' => array('top',
// 'person',
@@@ -304,7 -338,14 +338,14 @@@
// // Add 'turbaContact' to this array if using
// // 'turbaType' attribute below, and 'calEntry'
// // if using 'freebusyUrl'.
+ // // For Active Directory:
+ // // 'objectclass' => array('organizationalPerson',
+ // // 'user',
+ // // 'group',
+ // // 'contact'),
// 'scope' => 'one',
+ // // For Active Directory:
+ // // 'scope' => 'sub',
// 'charset' => 'utf-8',
// // Consult the LDAP schema to verify that all required attributes for
// // an entry are set and add them if needed.
@@@ -315,10 -356,18 +356,18 @@@
// // field is assumed to have postalAddress syntax; otherwise the schema
// // is consulted for the syntax to use.
// 'checksyntax' => false,
- // 'version' => 3
+ // 'version' => 3,
+ //
+ // // For Active Directory you probably want to also set the following
+ // // parameters:
+ // // 'deref' => LDAP_DEREF_ALWAYS,
+ // // 'filter' => '&(SAMAccountName=*)(mail=*)',
+ // // 'referrals' => 0,
// ),
// 'map' => array(
// '__key' => 'dn',
+ //
+ // // Remove this mapping if using Active Directory server:
// '__uid' => 'uid',
//
// // From horde.schema. Make sure you have 'turbaContact' objectClass
@@@ -335,6 -384,13 +384,13 @@@
//
// // From rfc2739.schema:
// // 'freebusyUrl' => 'calFBURL',
+ //
+ // // For Active Directory servers:
+ // // 'name' => 'displayname',
+ // // 'title' => 'title',
+ // // 'cellPhone' => 'mobile',
+ // // 'department' => 'department',
+ // // 'company' => 'company',
// ),
// 'search' => array(
// 'name',
@@@ -350,6 -406,11 +406,11 @@@
// 'approximate' => array(
// 'cn',
// ),
+ // // For Active Directory servers:
+ // // 'approximate' => array(
+ // // 'displayname',
+ // // 'samaccountname',
+ // // ),
// 'export' => true,
// 'browse' => true,
// );
@@@ -772,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')) {
@@@ -808,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
More information about the pkg-horde-hackers
mailing list