[Svn] r5393 - in branches/release-0.7: config program/include

trac at roundcube.net trac at roundcube.net
Sat Nov 5 12:42:47 CET 2011


Author: thomasb
Date: 2011-11-05 06:42:47 -0500 (Sat, 05 Nov 2011)
New Revision: 5393

Modified:
   branches/release-0.7/config/main.inc.php.dist
   branches/release-0.7/program/include/rcube_ldap.php
Log:
Backported r5392 to release branch

Modified: branches/release-0.7/config/main.inc.php.dist
===================================================================
--- branches/release-0.7/config/main.inc.php.dist	2011-11-05 11:34:53 UTC (rev 5392)
+++ branches/release-0.7/config/main.inc.php.dist	2011-11-05 11:42:47 UTC (rev 5393)
@@ -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)

Modified: branches/release-0.7/program/include/rcube_ldap.php
===================================================================
--- branches/release-0.7/program/include/rcube_ldap.php	2011-11-05 11:34:53 UTC (rev 5392)
+++ branches/release-0.7/program/include/rcube_ldap.php	2011-11-05 11:42:47 UTC (rev 5393)
@@ -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");

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list