From: Howard Chu <hyc@openldap.org>
Date: Fri, 8 Jun 2007 10:15:06 +0000 (+0000)
Subject: ITS#4970 from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5295e95c0e913eb03b6cc25d1855c7cb882437d5;p=thirdparty%2Fopenldap.git

ITS#4970 from HEAD
---

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index 7524572fb6..94f9f29002 100644
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -1692,7 +1692,10 @@ ppolicy_modify( Operation *op, SlapReply *rs )
 		goto return_results;
 	}
 
-	if (pp.pwdMinAge > 0) {
+	/* Check age, but only if pwdReset is not TRUE */
+	pa = attr_find( e->e_attrs, ad_pwdReset );
+	if ((!pa || !bvmatch( &pa->a_nvals[0], &slap_true_bv )) &&
+		pp.pwdMinAge > 0) {
 		time_t pwtime = (time_t)-1, now;
 		int age;