diff options
| author | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
| commit | a632b4789caf015f977f45e2d106cc00efa1239f (patch) | |
| tree | eb8a772c0dc7204d341277f265caa0c7c543c32c /crypto/openssh/auth.c | |
| parent | 8cf8ce7bb13515db269566309a8e9cd8b309ee56 (diff) | |
| download | FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.zip FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.tar.gz | |
Resolve conflicts and update for FreeBSD.
Diffstat (limited to 'crypto/openssh/auth.c')
| -rw-r--r-- | crypto/openssh/auth.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index d3425a2..2497e15 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -2,6 +2,8 @@ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved * Copyright (c) 2000 Markus Friedl. All rights reserved. + * + * $FreeBSD$ */ #include "includes.h" @@ -106,6 +108,16 @@ allowed_user(struct passwd * pw) return 0; } } +#ifndef __FreeBSD__ /* FreeBSD handle it later */ + /* Fail if the account's expiration time has passed. */ + if (pw->pw_expire != 0) { + struct timeval tv; + + (void)gettimeofday(&tv, NULL); + if (tv.tv_sec >= pw->pw_expire) + return 0; + } +#endif /* !__FreeBSD__ */ /* We found no reason not to let this user try to log on... */ return 1; } |
