summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-10-30 15:31:55 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-10-30 15:31:55 +1100
commit42308a43745ef51d51fb941d15554be0bf379b1f (patch)
tree4cfd9ebe66121a7fc25aa32bc8b57411a8b597ba /session.c
parent88edf6255bbc6c0ba87239608bb9b80656391330 (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@
Diffstat (limited to 'session.c')
-rw-r--r--session.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/session.c b/session.c
index db8722f47..2a1a25ac4 100644
--- a/session.c
+++ b/session.c
@@ -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