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) |
- (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 @@ | |||
1 | 20050421 | ||
2 | - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if | ||
3 | UseLogin is set as PAM is not used to establish credentials in that | ||
4 | case. Found by Michael Selvesteen, ok djm@ | ||
5 | |||
1 | 20050419 | 6 | 20050419 |
2 | - (dtucker) [INSTALL] Reference README.privsep for the privilege separation | 7 | - (dtucker) [INSTALL] Reference README.privsep for the privilege separation |
3 | requirements. Pointed out by Bengt Svensson. | 8 | requirements. Pointed out by Bengt Svensson. |
@@ -2436,4 +2441,4 @@ | |||
2436 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2441 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2437 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2442 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2438 | 2443 | ||
2439 | $Id: ChangeLog,v 1.3744 2005/04/19 05:40:51 dtucker Exp $ | 2444 | $Id: ChangeLog,v 1.3745 2005/04/21 09:50:55 dtucker Exp $ |
@@ -1477,7 +1477,8 @@ do_child(Session *s, const char *command) | |||
1477 | } | 1477 | } |
1478 | 1478 | ||
1479 | #ifdef USE_PAM | 1479 | #ifdef USE_PAM |
1480 | if (options.use_pam && !is_pam_session_open()) { | 1480 | if (options.use_pam && !options.use_login && !is_pam_session_open()) { |
1481 | debug3("PAM session not opened, exiting"); | ||
1481 | display_loginmsg(); | 1482 | display_loginmsg(); |
1482 | exit(254); | 1483 | exit(254); |
1483 | } | 1484 | } |