ITS#9279 fix Netscape password_expired control

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index 7f90d7763721ea2e84b1f6d5c97719a9c0257b02..c501ed91508b30251edb008be101c081ed1e44aa 100644 (file)
--- 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 );