diff options
| author | Mike Pritchard <mpp@FreeBSD.org> | 1995-08-28 21:30:59 +0000 |
|---|---|---|
| committer | Mike Pritchard <mpp@FreeBSD.org> | 1995-08-28 21:30:59 +0000 |
| commit | ae532ecb79a736724b77e8ceab00bb73ea1e3e18 (patch) | |
| tree | 67278d75d3abf5f6772c71401cc931a0c8700dee /libexec/rshd | |
| parent | d1017b80bf6700bda12884c8a6c4d7c8793900de (diff) | |
Notes
Diffstat (limited to 'libexec/rshd')
| -rw-r--r-- | libexec/rshd/rshd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 1b9eea9e1e58..77636015f340 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -445,9 +445,10 @@ doit(fromp) #endif if (errorstr || - pwd->pw_passwd != 0 && *pwd->pw_passwd != '\0' && + (pwd->pw_expire && time(NULL) >= pwd->pw_expire) || + (pwd->pw_passwd != 0 && *pwd->pw_passwd != '\0' && iruserok(fromp->sin_addr.s_addr, pwd->pw_uid == 0, - remuser, locuser) < 0) { + remuser, locuser) < 0)) { if (__rcmd_errstr) syslog(LOG_INFO|LOG_AUTH, "%s@%s as %s: permission denied (%s). cmd='%.80s'", |