From 39b39a8b6a7b5fcf645866a9bfdcf505aea6d5ab Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 1 Jul 2009 22:59:24 +0000 Subject: [PATCH] back out prev commit, head only (ITS#6084) --- CHANGES | 1 - servers/slapd/overlays/ppolicy.c | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 1a66341e36..a9852b504d 100644 --- a/CHANGES +++ b/CHANGES @@ -46,7 +46,6 @@ OpenLDAP 2.4.17 Engineering Fixed slapo-perl symbols (ITS#5658) Fixed slapo-ppolicy to honor pwdLockout (ITS#6168) Fixed slapo-ppolicy to return check modules error message (ITS#6082) - Fixed slapo-ppolicy with future lockout times (ITS#6084) Fixed slapo-refint refint_repair handling (ITS#6056) Added slapo-rwm rwm-drop-unrequested-attrs config option (ITS#6057) Fixed slapo-rwm dn passing (ITS#6070) diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c index 8b374a8f87..10870f3755 100644 --- a/servers/slapd/overlays/ppolicy.c +++ b/servers/slapd/overlays/ppolicy.c @@ -338,18 +338,14 @@ account_locked( Operation *op, Entry *e, time_t then, now; Modifications *m; + if (!pp->pwdLockoutDuration) + return 1; + if ((then = parse_time( vals[0].bv_val )) == (time_t)0) return 1; now = slap_get_time(); - /* Still in the future? not yet in effect */ - if (now < then) - return 0; - - if (!pp->pwdLockoutDuration) - return 1; - if (now < then + pp->pwdLockoutDuration) return 1; -- 2.39.5