From: Howard Chu <hyc@openldap.org>
Date: Thu, 30 Jul 2020 16:28:06 +0000 (+0100)
Subject: ITS#9279 fix Netscape password_expired control
X-Git-Tag: OPENLDAP_REL_ENG_2_4_51~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20a59e9106611efe87aa04e49d708221a8799d40;p=thirdparty%2Fopenldap.git

ITS#9279 fix Netscape password_expired control
---

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index d3a7b612e1..d3c3782216 100644
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -1319,7 +1319,7 @@ locked:
 		}
 		ctrl = create_passcontrol( op, warn, ngut, ppb->pErr );
 	} else if ( pi->send_netscape_controls ) {
-		if ( ppb->pErr != PP_noError || ngut > 0 ) {
+		if ( ppb->pErr != PP_noError || pwExpired ) {
 			ctrl = create_passexpiry( op, 1, 0 );
 		} else if ( warn > 0 ) {
 			ctrl = create_passexpiry( op, 0, warn );