Module administration

Rebase fix ldap auth for testing issue. refs #4092
Icinga · Jun 26, 2013 · 72bb02d · 72bb02d
1 parent d1f4e98
commit 72bb02d
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -8,6 +8,7 @@
 use Icinga\Authentication\UserBackend;
 use Icinga\Authentication\Credentials;
 use Icinga\Protocol\Ldap;
+use Icinga\Application\Config;
 
 class LdapUserBackend implements UserBackend
 {
@@ -33,16 +34,25 @@ protected function stripAsterisks($string)
     protected function selectUsername($username)
     {
         return $this->connection->select()
-            ->from('user', array('sAMAccountName'))
-            ->where('sAMAccountName', $this->stripAsterisks($username));
+            ->from(
+                Config::getInstance()->authentication->users->user_class,
+                array(
+                    Config::getInstance()->authentication->users->user_name_attribute
+                )
+            )
+            ->where(
+                Config::getInstance()->authentication->users->user_name_attribute,
+                $this->stripAsterisks($username)
+            );
     }
 
     public function authenticate(Credentials $credentials)
     {
         if (!$this->connection->testCredentials(
             $this->connection->fetchDN($this->selectUsername($credentials->getUsername())),
             $credentials->getPassword()
-        )     ) {
+        )
+        ) {
             return false;
         }
         $user = new User($credentials->getUsername());