diff options
| author | djm <djm> | 2003-05-14 05:11:48 +0000 |
|---|---|---|
| committer | djm <djm> | 2003-05-14 05:11:48 +0000 |
| commit | a57327190a1c0fe3e456b7c3ca6d550bb2172056 (patch) | |
| tree | bcbef19aa3a83f9b4ffd5556a9d917654b944dee /auth.c | |
| parent | b084f3eb966ff2100a6c545d9d9c6ade5c27f0a8 (diff) | |
| download | openssh-a57327190a1c0fe3e456b7c3ca6d550bb2172056.tar.gz | |
- (djm) Add new UsePAM configuration directive to allow runtime control
over usage of PAM. This allows non-root use of sshd when built with
--with-pam
Diffstat (limited to 'auth.c')
| -rw-r--r-- | auth.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -78,8 +78,8 @@ allowed_user(struct passwd * pw) #ifdef WITH_AIXAUTHENTICATE char *loginmsg; #endif /* WITH_AIXAUTHENTICATE */ -#if !defined(USE_PAM) && defined(HAVE_SHADOW_H) && \ - !defined(DISABLE_SHADOW) && defined(HAS_SHADOW_EXPIRE) +#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) && \ + defined(HAS_SHADOW_EXPIRE) struct spwd *spw; time_t today; #endif @@ -88,10 +88,10 @@ allowed_user(struct passwd * pw) if (!pw || !pw->pw_name) return 0; -#if !defined(USE_PAM) && defined(HAVE_SHADOW_H) && \ - !defined(DISABLE_SHADOW) && defined(HAS_SHADOW_EXPIRE) +#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) && \ + defined(HAS_SHADOW_EXPIRE) #define DAY (24L * 60 * 60) /* 1 day in seconds */ - if ((spw = getspnam(pw->pw_name)) != NULL) { + if (!options.use_pam && (spw = getspnam(pw->pw_name)) != NULL) { today = time(NULL) / DAY; debug3("allowed_user: today %d sp_expire %d sp_lstchg %d" " sp_max %d", (int)today, (int)spw->sp_expire, |