From 1afe37e25b56776e762d739230156ce48468d76a Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 7 Mar 2014 20:59:32 +0700
Subject: [PATCH] IDEMPIERE-1670:log-in with ldap account fail

---
 .../src/org/compiere/util/Login.java          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java
index 0eb8185a9d..50c3e3df76 100644
--- a/org.adempiere.base/src/org/compiere/util/Login.java
+++ b/org.adempiere.base/src/org/compiere/util/Login.java
@@ -1240,11 +1240,7 @@ public class Login
 
 		if (system.isLDAP())
 		{
-			authenticated = system.isLDAP(app_user, app_pwd);
-			if (authenticated){
-				app_pwd = null;
-				authenticated=true;
-			}
+			authenticated = system.isLDAP(app_user, app_pwd);			
 			// if not authenticated, use AD_User as backup
 		}
 
@@ -1328,12 +1324,16 @@ public class Login
 			}
 			clientsValidated.add(user.getAD_Client_ID());
 			boolean valid = false;
-			if (hash_password) {
+			// authenticated by ldap
+			if (authenticated){
+				valid = true;
+			} else if (hash_password) {
 				valid = user.authenticateHash(app_pwd);
 			} else {
 				// password not hashed
 				valid = user.getPassword() != null && user.getPassword().equals(app_pwd);
-			}
+			}			
+			
 			if (valid ) {			
 				if (user.isLocked())
 				{
@@ -1341,7 +1341,10 @@ public class Login
 					continue;
 				}
 				
-				if (user.isExpired())
+				if (authenticated){
+					// use Ldap because don't check password age
+				}
+				else if (user.isExpired())
 					isPasswordExpired = true;
 				else if (MAX_PASSWORD_AGE > 0 && !user.isNoPasswordReset())
 				{