This is an automated email from the ASF dual-hosted git repository. surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 443025e37fdbad9715a24430be176b2ee5370bad Merge: fc6b8a6 c52e437 Author: Suraj Khurana <[email protected]> AuthorDate: Tue Jul 7 15:10:53 2020 +0530 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk applications/order/minilang/test/OrderTests.xml | 141 ------------- .../org/apache/ofbiz/order/OrderTests.groovy | 107 ++++++++++ applications/order/testdef/OrderTest.xml | 2 +- .../minilang/shipment/test/ShipmentTests.xml | 218 --------------------- .../org/apache/ofbiz/product/ShipmentTests.groovy | 203 +++++++++++++++++++ applications/product/testdef/FacilityTest.xml | 2 +- build.gradle | 2 +- .../apache/ofbiz/common/login/LoginServices.java | 4 +- framework/security/config/security.properties | 8 +- 9 files changed, 321 insertions(+), 366 deletions(-) diff --cc framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java index e38ddba,ef84b93..6401a0b --- a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java @@@ -1039,12 -1039,12 +1039,12 @@@ public class LoginServices String errMsg = null; + // if it's a system account (aka adminUser) don't bother checking the passwords if (!ignoreCurrentPassword) { // if the password.accept.encrypted.and.plain property in security is set to true allow plain or encrypted passwords - // if this is a system account don't bother checking the passwords boolean passwordMatches = checkPassword(userLogin.getString("currentPassword"), useEncryption, currentPassword); if ((currentPassword == null) || (!passwordMatches)) { - errMsg = UtilProperties.getMessage(RESOURCE,"loginservices.old_password_not_correct_reenter", locale); + errMsg = UtilProperties.getMessage(RESOURCE, "loginservices.old_password_not_correct_reenter", locale); errorMessageList.add(errMsg); } if (checkPassword(userLogin.getString("currentPassword"), useEncryption, newPassword)) {
