From 8f2ea93bb09b8744de56a8797176d3a209c2e8d7 Mon Sep 17 00:00:00 2001
From: Axel Angel <axel+git@vneko.ch>
Date: Thu, 8 May 2014 12:19:39 +0200
Subject: Simplify code and remove unreachable check

---
 lib/plugins/authldap/auth.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'lib/plugins/authldap')

diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index ecbbc2a3a..bda8f2abe 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -278,17 +278,10 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
         // find the information about the user, in particular the "dn"
         $info = $this->getUserData($user,true);
         if(empty($info['dn'])) {
-            msg('LDAP cannot find your user dn: '. htmlspecialchars($info['dn']));
-            return false;
-        } else {
-            $dn = $info['dn'];
-        }
-
-        // find the new password and encrypt it whit SSHA
-        if(empty($changes['pass'])) {
-            msg('The new password is not allow because it\'s empty');
+            msg('LDAP cannot find your user dn');
             return false;
         }
+        $dn = $info['dn'];
 
         // find the old password of the user
         list($loginuser,$loginsticky,$loginpass) = auth_getCookie();
-- 
cgit v1.2.3