details: https://code.openbravo.com/erp/devel/main/rev/45f454a1d15f changeset: 21694:45f454a1d15f user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Dec 23 14:13:08 2013 +0530 summary: Fixes Issue 0024962: It should be possible to lock a user only with parameter "login.trial.user.lock"
The user can be locked with the login.trial.user.lock parameter. If the the login.trial.delay.increment is not 0 it will be used, else lock parameter alone will be checked. details: https://code.openbravo.com/erp/devel/main/rev/a6ebb8307561 changeset: 21695:a6ebb8307561 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Dec 24 09:01:07 2013 +0100 summary: Merge back from main diffstat: .hgsigs | 1 + .hgtags | 1 + src/org/openbravo/base/secureApp/UserLock.java | 2 +- 3 files changed, 3 insertions(+), 1 deletions(-) diffs (34 lines): diff -r a142b9d853cc -r a6ebb8307561 .hgsigs --- a/.hgsigs Mon Dec 23 10:49:59 2013 +0100 +++ b/.hgsigs Tue Dec 24 09:01:07 2013 +0100 @@ -132,6 +132,7 @@ 3dff4a5ade8aa7966fde9139428e968fb7f04218 0 iEYEABECAAYFAlJlPOMACgkQCX/oGf+2qkPsbgCg4w/JC1tFhyxz6mXa6UBOaEYz6esAnRCq24eVAcoNGrAfIfhXvKUBuQMQ 8b9a63ffa8e5d52b063db22a52f747a3c616affc 0 iEYEABECAAYFAlKe/L8ACgkQCX/oGf+2qkMfuwCfafnQo9e1Wva5pycMnkB4/WDQgJoAoLJdXDJt51XxtNI5Orod5XJA+HMX bfe21782cd33b4c3bed1cd733f455de6dc61c766 0 iEYEABECAAYFAlKup5AACgkQCX/oGf+2qkNIUwCgmrPTAq/4glNIJPzOxIl9C5gw1pEAoN+hKrdK0v/e9SEVmKsNYlQx/NZr +91ad366d9f86581478da0bb3d99d7ff3331cc122 0 iEYEABECAAYFAlK4JWQACgkQCX/oGf+2qkMErACg7Iyuv6yHr/cH6r73takBnxpIo68AoK9F6kNatgr1uLzcuYEJmvpTEa+f 2630b57465e0c53e77eb0c08140ad461f8a6024f 0 iEYEABECAAYFAlKF+CoACgkQCX/oGf+2qkOn9wCeKuzyuNK/+6xev5U3u8tO6W0eT1YAmwbnnNrtFQRhq0Wd3jFWpbykW/vI f2a17a54900bff00269ae2ea9b904a32134de48f 0 iEYEABECAAYFAlKMuRsACgkQCX/oGf+2qkN1pwCeJzq8oiozQ5qgSNB6ZBboqjEwppEAniyBrwJie/OiwFTaP5VIxp+ceDSQ 4c222ccbbea79a4343b1ff1729106becebebbc39 0 iEYEABECAAYFAlKwPmcACgkQCX/oGf+2qkP0awCfVBWE5p7hLNtnbzLL60SS5+ZsrogAn1d7xhYIm/nJ03Jlqs1jXg0iJcgM diff -r a142b9d853cc -r a6ebb8307561 .hgtags --- a/.hgtags Mon Dec 23 10:49:59 2013 +0100 +++ b/.hgtags Tue Dec 24 09:01:07 2013 +0100 @@ -143,6 +143,7 @@ 0c73b69e61c55d8de0b3a0dfcc2e7511fa8a295f 3.0MP28.2 72950e8d3e2a52a8c2c704f38f53977dcd46a297 3.0MP28.3 0b0fda0f36cb25ffd9652b73d69d81f711275091 3.0MP28.4 +557cef358a018c6b4b42bb416a94a18b973773ae 3.0MP28.5 cf86ae37f1bab9f9e401a6835258aabbdc91a705 3.0MP29 f7af9706971ab040115da0a457c0034c53731ead 3.0MP29.1 d58f931280521ed35a3bfc7d7fcaa60186489ba2 3.0MP30 diff -r a142b9d853cc -r a6ebb8307561 src/org/openbravo/base/secureApp/UserLock.java --- a/src/org/openbravo/base/secureApp/UserLock.java Mon Dec 23 10:49:59 2013 +0100 +++ b/src/org/openbravo/base/secureApp/UserLock.java Tue Dec 24 09:01:07 2013 +0100 @@ -102,7 +102,7 @@ this.userName = userName; setUser(); - if (delayInc == 0) { + if (delayInc == 0 && lockAfterTrials == 0) { // No need to check number of fails as login security is not enabled delay = 0; numberOfFails = 0; ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
