2 commits - lib/Auth

[Aleksander Machniak]

 lib/Auth/LDAP.php |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 72fa65ee528f8ae291e7969faad36f4c5bdff7e4
Merge: 2effaae 312fc25
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Mar 16 14:37:44 2012 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap



commit 2effaae4b63e4dec5b3a8d5ac37a7651aa1ef81b
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Mar 16 14:36:55 2012 +0100

    Fixed typos in group_info() and group_members_list()

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) {