From 8849d83f75e694aaed14d2fa1e9dc19f1b60d42c Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Thu, 30 Jul 2020 17:28:06 +0100
Subject: [PATCH] ITS#9279 fix Netscape password_expired control

---
 servers/slapd/overlays/ppolicy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index 7f90d77637..c501ed9150 100644
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -1773,7 +1773,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 );