From 69cb80b0594add4d18f8de6b5c676f1dc4d0a835 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 05 Nov 2011 07:42:47 -0400
Subject: [PATCH] Backported r5392 to release branch
---
program/include/rcube_ldap.php | 3 +++
config/main.inc.php.dist | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 3782374..896fcbe 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -586,6 +586,7 @@
'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/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 8329315..e20c8b4 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -181,6 +181,9 @@
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");
--
Gitblit v1.9.1