back out prev commit, head only (ITS#6084)

diff --git a/CHANGES b/CHANGES
index 1a66341e3600171c02f7860b8233c1f1b4cfa6ef..a9852b504dcfd4cd10fde0e2700be9fc3a1b0a27 100644 (file)
--- 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 8b374a8f87c96579353cdc82c16610f5cf1b6d12..10870f3755ef9c30e661703eb3032aceb23132ad 100644 (file)
--- 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;