From 42308a43745ef51d51fb941d15554be0bf379b1f Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 30 Oct 2005 15:31:55 +1100
Subject:  - (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@

---
 ChangeLog | 7 ++++++-
 session.c | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3571cb2dc..de9bd9f29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
  - (djm) [contrib/suse/openssh.spec contrib/suse/rc.
    sshd contrib/suse/sysconfig.ssh] Bug #1106: Updated SuSE spec and init 
    files from imorgan AT nas.nasa.gov
+ - (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@
 
 20051025
  - (dtucker) [configure.ac] Relocate LLONG_MAX calculation to after the
@@ -3120,4 +3125,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.3924 2005/10/30 00:55:45 djm Exp $
+$Id: ChangeLog,v 1.3925 2005/10/30 04:31:55 dtucker Exp $
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)
 		if (!check_quietlogin(s, command))
 			do_motd();
 #else /* HAVE_OSF_SIA */
-		do_nologin(pw);
+		/* When PAM is enabled we rely on it to do the nologin check */
+		if (!options.use_pam)
+			do_nologin(pw);
 		do_setusercontext(pw);
 		/*
 		 * PAM session modules in do_setusercontext may have
-- 
cgit v1.2.3