summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-02-22 10:23:35 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-02-22 10:23:35 +1100
commitb4dc6c23a58a5e12c292c5cb3613bd5d924ff5ea (patch)
tree0dc86859e707ef496ceb5989eed731299d552fd4
parentaa0aecad99c4714336117d22a7c68982684cef4b (diff)
- (dtucker) [auth-passwd.c] Only check password expiry once. Prevents
multiple warnings if a wrong password is entered.
-rw-r--r--auth-passwd.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/auth-passwd.c b/auth-passwd.c
index 28f29cc6..b9679abd 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -64,6 +64,7 @@ auth_password(Authctxt *authctxt, const char *password)
{
struct passwd * pw = authctxt->pw;
int ok = authctxt->valid;
+ static int expire_checked = 0;
#ifndef HAVE_CYGWIN
if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
@@ -98,9 +99,12 @@ auth_password(Authctxt *authctxt, const char *password)
}
#endif
#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
- if (auth_shadow_pwexpired(authctxt)) {
- disable_forwarding();
- authctxt->force_pwchange = 1;
+ if (!expire_checked) {
+ expire_checked = 1;
+ if (auth_shadow_pwexpired(authctxt)) {
+ disable_forwarding();
+ authctxt->force_pwchange = 1;
+ }
}
#endif