From 50d0a61176a5ba827ab6e49ec85ca2d3639b10df Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 14 Feb 2008 03:32:55 +0000 Subject: [PATCH] Fix [ 1722235 ] Encryption for password wrongly managed --- base/src/org/compiere/util/Login.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/src/org/compiere/util/Login.java b/base/src/org/compiere/util/Login.java index 2a20e64997..97a4049562 100644 --- a/base/src/org/compiere/util/Login.java +++ b/base/src/org/compiere/util/Login.java @@ -254,7 +254,8 @@ public class Login .append(" AND u.IsActive='Y'") .append(" AND EXISTS (SELECT * FROM AD_Client c WHERE u.AD_Client_ID=c.AD_Client_ID AND c.IsActive='Y')"); if (app_pwd != null) - sql.append(" AND (u.Password=? OR u.Password=?)"); // #2/3 + sql.append(" AND ((u.Password=? AND (SELECT IsEncrypted FROM AD_Column WHERE AD_Column_ID=417)='N') " + + "OR (u.Password=? AND (SELECT IsEncrypted FROM AD_Column WHERE AD_Column_ID=417)='Y'))"); // #2/3 sql.append(" ORDER BY r.Name"); PreparedStatement pstmt = null; ResultSet rs = null;