ITS#6084

CHANGES

@@ -46,6 +46,7 @@ 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)

servers/slapd/overlays/ppolicy.c

@@ -338,14 +338,18 @@ 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;