- (djm) Enable /etc/nologin check on PAM systems, as some lack the

   pam_nologin module. Report from William Yodlowsky
   <bsd@openbsd.rutgers.edu>

2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index bfe383aef..ce9cf665b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20010713
+ - (djm) Enable /etc/nologin check on PAM systems, as some lack the 
+   pam_nologin module. Report from William Yodlowsky 
+   <bsd@openbsd.rutgers.edu>
+
 20010711
  - (djm) dirname(3) may modify its argument on glibc and other systems. 
    Patch from markus@, spotted by Tom Holroyd <tomh@po.crl.go.jp>
@@ -5972,4 +5977,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1384 2001/07/11 11:32:20 djm Exp $
+$Id: ChangeLog,v 1.1385 2001/07/14 01:54:05 djm Exp $
diff --git a/session.c b/session.c
index 8b9b7cc4b..8d7ef52ba 100644
--- a/session.c
+++ b/session.c
@@ -1050,7 +1050,7 @@ do_child(Session *s, const char *command)
         if (options.use_login && command != NULL)
                 options.use_login = 0;
 
-#if !defined(USE_PAM) && !defined(HAVE_OSF_SIA)
+#if !defined(HAVE_OSF_SIA)
         if (!options.use_login) {
 # ifdef HAVE_LOGIN_CAP
                 if (!login_getcapbool(lc, "ignorenologin", 0) && pw->pw_uid)
@@ -1068,7 +1068,7 @@ do_child(Session *s, const char *command)
                         exit(254);
                 }
         }
-#endif /* USE_PAM || HAVE_OSF_SIA */
+#endif /* HAVE_OSF_SIA */
 
         /* Set login name, uid, gid, and groups. */
         /* Login(1) does this as well, and it needs uid 0 for the "-h"