summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-03-16 14:10:41 (GMT)
committerAleksander Machniak <alec@alec.pl>2012-03-16 14:10:41 (GMT)
commit1f0b3a7a7dac41932e425a0d27345e07be566e3e (patch)
tree3241123df40f3286f8f536b684131d3c156c2168
parent2b622ff7107d11ebe374fad034beda8f0c611d2a (diff)
parent72fa65ee528f8ae291e7969faad36f4c5bdff7e4 (diff)
downloadkolab-wap-1f0b3a7a7dac41932e425a0d27345e07be566e3e.tar.gz
Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap
-rw-r--r--lib/Auth/LDAP.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index fffa1f1..6e4fab7 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -345,8 +345,7 @@ class LDAP
$group_dn = $this->_get_group_dn($root_dn, '(mail=' . $group . ')');
}
else {
- # TODO: Where does user come from?
- $group_dn = $user;
+ $group_dn = $group;
}
if (!$group_dn) {
@@ -364,7 +363,7 @@ class LDAP
$group_dn = $this->_get_group_dn($root_dn, '(mail=' . $group . ')');
}
else {
- $group_dn = $user;
+ $group_dn = $group;
}
if (!$group_dn) {