|
 |
db96ff |
From ddd068c82cb039ddb4531d4817f75252eef51332 Mon Sep 17 00:00:00 2001
|
|
|
db96ff |
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
db96ff |
Date: Wed, 14 Aug 2019 09:41:24 +0200
|
|
|
db96ff |
Subject: [PATCH 23/23] Backport typo fixes in password expiration warnings
|
|
|
db96ff |
|
|
|
db96ff |
---
|
|
|
db96ff |
nslcd/myldap.c | 16 ++++++++--------
|
|
|
db96ff |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
db96ff |
|
|
|
db96ff |
diff --git a/nslcd/myldap.c b/nslcd/myldap.c
|
|
|
db96ff |
index f83137a..4b53af2 100644
|
|
|
db96ff |
--- a/nslcd/myldap.c
|
|
|
db96ff |
+++ b/nslcd/myldap.c
|
|
|
db96ff |
@@ -430,36 +430,36 @@ static void print_ppolicy_expiry(MYLDAP_SESSION *session, unsigned int sec)
|
|
|
db96ff |
}
|
|
|
db96ff |
if (days > 1)
|
|
|
db96ff |
mysnprintf(session->policy_message, sizeof(session->policy_message),
|
|
|
db96ff |
- "Password will expires in %u days", days);
|
|
|
db96ff |
+ "Password will expire in %u days", days);
|
|
|
db96ff |
else if (days > 0)
|
|
|
db96ff |
mysnprintf(session->policy_message, sizeof(session->policy_message),
|
|
|
db96ff |
- "Password will expires in %u hours", hours + 24);
|
|
|
db96ff |
+ "Password will expire in %u hours", hours + 24);
|
|
|
db96ff |
else if (hours > 1)
|
|
|
db96ff |
{
|
|
|
db96ff |
if (minutes > 1)
|
|
|
db96ff |
mysnprintf(session->policy_message, sizeof(session->policy_message),
|
|
|
db96ff |
- "Password will expires in %u hours and %u minutes",
|
|
|
db96ff |
+ "Password will expire in %u hours and %u minutes",
|
|
|
db96ff |
hours, minutes);
|
|
|
db96ff |
else
|
|
|
db96ff |
mysnprintf(session->policy_message, sizeof(session->policy_message),
|
|
|
db96ff |
- "Password will expires in %u hours", hours);
|
|
|
db96ff |
+ "Password will expire in %u hours", hours);
|
|
|
db96ff |
}
|
|
|
db96ff |
else if (hours > 0)
|
|
|
db96ff |
mysnprintf(session->policy_message, sizeof(session->policy_message),
|
|
|
db96ff |
- "Password will expires in %u minutes", minutes + 60);
|
|
|
db96ff |
+ "Password will expire in %u minutes", minutes + 60);
|
|
|
db96ff |
else if (minutes > 1)
|
|
|
db96ff |
{
|
|
|
db96ff |
if (sec > 1)
|
|
|
db96ff |
mysnprintf(session->policy_message, sizeof(session->policy_message),
|
|
|
db96ff |
- "Password will expires in %u minutes and %u seconds",
|
|
|
db96ff |
+ "Password will expire in %u minutes and %u seconds",
|
|
|
db96ff |
minutes, sec);
|
|
|
db96ff |
else
|
|
|
db96ff |
mysnprintf(session->policy_message, sizeof(session->policy_message),
|
|
|
db96ff |
- "Password will expires in %u minutes", minutes);
|
|
|
db96ff |
+ "Password will expire in %u minutes", minutes);
|
|
|
db96ff |
}
|
|
|
db96ff |
else
|
|
|
db96ff |
mysnprintf(session->policy_message, sizeof(session->policy_message),
|
|
|
db96ff |
- "Password will expires in %u seconds", sec);
|
|
|
db96ff |
+ "Password will expire in %u seconds", sec);
|
|
|
db96ff |
}
|
|
|
db96ff |
|
|
|
db96ff |
static void handle_ppolicy_controls(MYLDAP_SESSION *session, LDAP *ld, LDAPControl **ctrls)
|
|
|
db96ff |
--
|
|
|
db96ff |
2.20.1
|
|
|
db96ff |
|