diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-10-30 15:31:55 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-10-30 15:31:55 +1100 |
commit | 42308a43745ef51d51fb941d15554be0bf379b1f (patch) | |
tree | 4cfd9ebe66121a7fc25aa32bc8b57411a8b597ba | |
parent | 88edf6255bbc6c0ba87239608bb9b80656391330 (diff) |
- (dtucker) [session.c] Bug #1045do not check /etc/nologin when PAM is
enabled, instead allow PAM to handle it. Note that on platforms using PAM,
the pam_nologin module should be added to sshd's session stack in order to
maintain exising behaviour. Based on patch and discussion from t8m at
centrum.cz, ok djm@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | session.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -2,6 +2,11 @@ | |||
2 | - (djm) [contrib/suse/openssh.spec contrib/suse/rc. | 2 | - (djm) [contrib/suse/openssh.spec contrib/suse/rc. |
3 | sshd contrib/suse/sysconfig.ssh] Bug #1106: Updated SuSE spec and init | 3 | sshd contrib/suse/sysconfig.ssh] Bug #1106: Updated SuSE spec and init |
4 | files from imorgan AT nas.nasa.gov | 4 | files from imorgan AT nas.nasa.gov |
5 | - (dtucker) [session.c] Bug #1045do not check /etc/nologin when PAM is | ||
6 | enabled, instead allow PAM to handle it. Note that on platforms using PAM, | ||
7 | the pam_nologin module should be added to sshd's session stack in order to | ||
8 | maintain exising behaviour. Based on patch and discussion from t8m at | ||
9 | centrum.cz, ok djm@ | ||
5 | 10 | ||
6 | 20051025 | 11 | 20051025 |
7 | - (dtucker) [configure.ac] Relocate LLONG_MAX calculation to after the | 12 | - (dtucker) [configure.ac] Relocate LLONG_MAX calculation to after the |
@@ -3120,4 +3125,4 @@ | |||
3120 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3125 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3121 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3126 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3122 | 3127 | ||
3123 | $Id: ChangeLog,v 1.3924 2005/10/30 00:55:45 djm Exp $ | 3128 | $Id: ChangeLog,v 1.3925 2005/10/30 04:31:55 dtucker Exp $ |
@@ -1471,7 +1471,9 @@ do_child(Session *s, const char *command) | |||
1471 | if (!check_quietlogin(s, command)) | 1471 | if (!check_quietlogin(s, command)) |
1472 | do_motd(); | 1472 | do_motd(); |
1473 | #else /* HAVE_OSF_SIA */ | 1473 | #else /* HAVE_OSF_SIA */ |
1474 | do_nologin(pw); | 1474 | /* When PAM is enabled we rely on it to do the nologin check */ |
1475 | if (!options.use_pam) | ||
1476 | do_nologin(pw); | ||
1475 | do_setusercontext(pw); | 1477 | do_setusercontext(pw); |
1476 | /* | 1478 | /* |
1477 | * PAM session modules in do_setusercontext may have | 1479 | * PAM session modules in do_setusercontext may have |