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

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

diff --git a/ChangeLog b/ChangeLog
index 4e1a4c992be3c1dc906bb7ac2282c6801152d9be..9c60f290fff2a8b90e112466ff0d2cb1ead00212 100644 (file)
--- 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>

diff --git a/session.c b/session.c
index 8b9b7cc4bd485cee5755ce4f5fb6a46480a9d252..8d7ef52ba2e9d6ca086aa577b2ecf77c9f81cd13 100644 (file)
--- 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"