summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-11-05 11:34:53 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-11-05 11:34:53 +0000
commit8ffa9922f2757230239118d0cdafb6782874885e (patch)
tree6b913f087ed04307beac749a2bd6e81d64583d4b
parent7a9c52ae56da365213ff7a10b1bd384d3d5a42e5 (diff)
Added config property to set LDAP_OPT_REFERRALS option to an LDAP connection
git-svn-id: https://svn.roundcube.net/trunk@5392 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/config/main.inc.php.dist1
-rw-r--r--roundcubemail/program/include/rcube_ldap.php3
2 files changed, 4 insertions, 0 deletions
diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist
index 3782374f3..896fcbe65 100644
--- a/roundcubemail/config/main.inc.php.dist
+++ b/roundcubemail/config/main.inc.php.dist
@@ -586,6 +586,7 @@ $rcmail_config['ldap_public']['Verisign'] = array(
'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting
'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit.
'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit.
+ 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups
// definition for contact groups (uncomment if no groups are supported)
// for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above)
diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php
index a81632545..ab891e3ea 100644
--- a/roundcubemail/program/include/rcube_ldap.php
+++ b/roundcubemail/program/include/rcube_ldap.php
@@ -189,6 +189,9 @@ class rcube_ldap extends rcube_addressbook
ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['ldap_version']);
$this->prop['host'] = $host;
$this->conn = $lc;
+
+ if (isset($this->prop['referrals']))
+ ldap_set_option($lc, LDAP_OPT_REFERRALS, $this->prop['referrals']);
break;
}
$this->_debug("S: NOT OK");