From ddd068c82cb039ddb4531d4817f75252eef51332 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Wed, 14 Aug 2019 09:41:24 +0200
Subject: [PATCH 23/23] Backport typo fixes in password expiration warnings

---
 nslcd/myldap.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index f83137a..4b53af2 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -430,36 +430,36 @@ static void print_ppolicy_expiry(MYLDAP_SESSION *session, unsigned int sec)
   }
   if (days > 1)
     mysnprintf(session->policy_message, sizeof(session->policy_message),
-               "Password will expires in %u days", days);
+               "Password will expire in %u days", days);
   else if (days > 0)
     mysnprintf(session->policy_message, sizeof(session->policy_message),
-               "Password will expires in %u hours", hours + 24);
+               "Password will expire in %u hours", hours + 24);
   else if (hours > 1)
   {
     if (minutes > 1)
       mysnprintf(session->policy_message, sizeof(session->policy_message),
-                 "Password will expires in %u hours and %u minutes",
+                 "Password will expire in %u hours and %u minutes",
                  hours, minutes);
     else
       mysnprintf(session->policy_message, sizeof(session->policy_message),
-                 "Password will expires in %u hours", hours);
+                 "Password will expire in %u hours", hours);
   }
   else if (hours > 0)
     mysnprintf(session->policy_message, sizeof(session->policy_message),
-               "Password will expires in %u minutes", minutes + 60);
+               "Password will expire in %u minutes", minutes + 60);
   else if (minutes > 1)
   {
     if (sec > 1)
       mysnprintf(session->policy_message, sizeof(session->policy_message),
-                 "Password will expires in %u minutes and %u seconds",
+                 "Password will expire in %u minutes and %u seconds",
                  minutes, sec);
     else
       mysnprintf(session->policy_message, sizeof(session->policy_message),
-                 "Password will expires in %u minutes", minutes);
+                 "Password will expire in %u minutes", minutes);
   }
   else
     mysnprintf(session->policy_message, sizeof(session->policy_message),
-               "Password will expires in %u seconds", sec);
+               "Password will expire in %u seconds", sec);
 }
 
 static void handle_ppolicy_controls(MYLDAP_SESSION *session, LDAP *ld, LDAPControl **ctrls)
-- 
2.20.1