- (djm) [contrib/sshd.pam.generic contrib/caldera/sshd.pam]
   [contrib/redhat/sshd.pam] Move pam_nologin to account group from
   incorrect auth group in example files;
   patch from imorgan AT nas.nasa.gov
diff --git a/ChangeLog b/ChangeLog
index d2f3b18..c9fec8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,10 @@
  - (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd]
    Make example scripts generate keys with default sizes rather than fixed,
    non-default 1024 bits; patch from imorgan AT nas.nasa.gov
+ - (djm) [contrib/sshd.pam.generic contrib/caldera/sshd.pam]
+   [contrib/redhat/sshd.pam] Move pam_nologin to account group from
+   incorrect auth group in example files;
+   patch from imorgan AT nas.nasa.gov
 
 20080906
  - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4843,4 +4847,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5126 2008/11/03 09:16:01 djm Exp $
+$Id: ChangeLog,v 1.5127 2008/11/03 09:18:12 djm Exp $
diff --git a/contrib/caldera/sshd.pam b/contrib/caldera/sshd.pam
index 26dcb34..f050a9a 100644
--- a/contrib/caldera/sshd.pam
+++ b/contrib/caldera/sshd.pam
@@ -1,6 +1,6 @@
 #%PAM-1.0
 auth       required     /lib/security/pam_pwdb.so shadow nodelay
-auth       required     /lib/security/pam_nologin.so
+account    required     /lib/security/pam_nologin.so
 account    required     /lib/security/pam_pwdb.so
 password   required     /lib/security/pam_cracklib.so
 password   required     /lib/security/pam_pwdb.so shadow nullok use_authtok
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam
index e486077..ffa5adb 100644
--- a/contrib/redhat/sshd.pam
+++ b/contrib/redhat/sshd.pam
@@ -1,6 +1,6 @@
 #%PAM-1.0
 auth       required     pam_stack.so service=system-auth
-auth       required     pam_nologin.so
+account    required     pam_nologin.so
 account    required     pam_stack.so service=system-auth
 password   required     pam_stack.so service=system-auth
 session    required     pam_stack.so service=system-auth
diff --git a/contrib/sshd.pam.generic b/contrib/sshd.pam.generic
index cf5af30..215f0fe 100644
--- a/contrib/sshd.pam.generic
+++ b/contrib/sshd.pam.generic
@@ -1,6 +1,6 @@
 #%PAM-1.0
 auth       required     /lib/security/pam_unix.so shadow nodelay
-auth       required     /lib/security/pam_nologin.so
+account    required     /lib/security/pam_nologin.so
 account    required     /lib/security/pam_unix.so
 password   required     /lib/security/pam_cracklib.so
 password   required     /lib/security/pam_unix.so shadow nullok use_authtok