diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-04-21 19:50:55 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-04-21 19:50:55 +1000 |
commit | 48554152b9f063f0f226f3eeb9f199be69975c2f (patch) | |
tree | 4eca6268e5e3a0dde1af2e2bc6106cc619bcefcf | |
parent | 8d158c9937e74cfa5c65187fca83f5ebc0dbef4c (diff) | |
download | openssh-git-48554152b9f063f0f226f3eeb9f199be69975c2f.tar.gz |
- (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if
UseLogin is set as PAM is not used to establish credentials in that
case. Found by Michael Selvesteen, ok djm@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | session.c | 3 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +20050421 + - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if + UseLogin is set as PAM is not used to establish credentials in that + case. Found by Michael Selvesteen, ok djm@ + 20050419 - (dtucker) [INSTALL] Reference README.privsep for the privilege separation requirements. Pointed out by Bengt Svensson. @@ -2436,4 +2441,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3744 2005/04/19 05:40:51 dtucker Exp $ +$Id: ChangeLog,v 1.3745 2005/04/21 09:50:55 dtucker Exp $ @@ -1477,7 +1477,8 @@ do_child(Session *s, const char *command) } #ifdef USE_PAM - if (options.use_pam && !is_pam_session_open()) { + if (options.use_pam && !options.use_login && !is_pam_session_open()) { + debug3("PAM session not opened, exiting"); display_loginmsg(); exit(254); } |