summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-01-23 14:30:33 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-01-23 17:18:40 (GMT)
commit40588bda28d3cc4ceb6315fab411a8003c5edb3c (patch)
tree51a3df013b4b3f48ff3cec27feb58a999071202d
parentacb61b85a9e80c19a225c65a0b8a2f9522dc4bf8 (diff)
downloadkolab-wap-40588bda28d3cc4ceb6315fab411a8003c5edb3c.tar.gz
Fix bug where type=*e* was added to some LDAP searches
-rw-r--r--lib/Auth/LDAP.php13
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index bcf2176..d3116c8 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -249,18 +249,13 @@ class LDAP extends Net_LDAP3 {
$mail_attrs = $this->conf->get_list('mail_attributes', array('mail', 'alias'));
- $search = array(
- 'params' => array(
- 'type' => 'exact'
- ),
- 'operator' => "OR"
- );
+ $search = array('operator' => 'OR');
foreach ($mail_attrs as $num => $attr) {
$search['params'][$attr] = array(
- 'type' => 'exact',
- 'value' => $address,
- );
+ 'type' => 'exact',
+ 'value' => $address,
+ );
}
$result = $this->search_entries($this->config_get('root_dn'), '(objectclass=*)', 'sub', null, $search);