From f96fca41a6766cd7f808a6fe38c07eeedae645c2 Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Sun, 8 Feb 2015 21:28:25 +0100
Subject: [PATCH] Closes #82.

---
 inc/auth.class.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/inc/auth.class.php b/inc/auth.class.php
index 1e8f09d8..dff07c06 100644
--- a/inc/auth.class.php
+++ b/inc/auth.class.php
@@ -47,9 +47,10 @@ class SP_Auth
             return false;
         }
 
-        $ldapGroupAccess = false;
         $message['action'] = __FUNCTION__;
 
+        $ldapGroupAccess = false;
+
         // Conectamos al servidor realizamos la conexión con el usuario proxy
         try {
             SP_LDAP::ldapConnect();
@@ -62,12 +63,12 @@ class SP_Auth
         $userDN = SP_LDAP::$ldapSearchData[0]['dn'];
         // Mapeo de los atributos
         $attribsMap = array(
-            'groupMembership' => 'group',
-            'memberOf' => 'group',
+            'groupmembership' => 'group',
+            'memberof' => 'group',
             'displayname' => 'name',
             'fullname' => 'name',
             'mail' => 'mail',
-            'lockoutTime' => 'expire');
+            'lockouttime' => 'expire');
 
         // Realizamos la conexión con el usuario real y obtenemos los atributos
         try {
@@ -101,10 +102,14 @@ class SP_Auth
             }
             // Comprobamos que el usuario está en el grupo indicado buscando en los atributos del grupo
         } else {
-            $ldapGroupAccess = SP_LDAP::searchUserInGroup($userDN);
+            try {
+                SP_LDAP::searchUserInGroup($userDN);
+            } catch (Exception $e){
+                $ldapGroupAccess = false;
+            }
         }
 
-        if ($ldapGroupAccess == false) {
+        if ($ldapGroupAccess === false){
             return 702;
         }