summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--contrib/caldera/sshd.pam2
-rw-r--r--contrib/redhat/sshd.pam2
-rw-r--r--contrib/sshd.pam.generic2
4 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d2f3b1841..c9fec8bf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,10 @@
109 - (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd] 109 - (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd]
110 Make example scripts generate keys with default sizes rather than fixed, 110 Make example scripts generate keys with default sizes rather than fixed,
111 non-default 1024 bits; patch from imorgan AT nas.nasa.gov 111 non-default 1024 bits; patch from imorgan AT nas.nasa.gov
112 - (djm) [contrib/sshd.pam.generic contrib/caldera/sshd.pam]
113 [contrib/redhat/sshd.pam] Move pam_nologin to account group from
114 incorrect auth group in example files;
115 patch from imorgan AT nas.nasa.gov
112 116
11320080906 11720080906
114 - (dtucker) [config.guess config.sub] Update to latest versions from 118 - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4843,4 +4847,4 @@
4843 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4847 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4844 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4848 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4845 4849
4846$Id: ChangeLog,v 1.5126 2008/11/03 09:16:01 djm Exp $ 4850$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 26dcb34d9..f050a9aee 100644
--- a/contrib/caldera/sshd.pam
+++ b/contrib/caldera/sshd.pam
@@ -1,6 +1,6 @@
1#%PAM-1.0 1#%PAM-1.0
2auth required /lib/security/pam_pwdb.so shadow nodelay 2auth required /lib/security/pam_pwdb.so shadow nodelay
3auth required /lib/security/pam_nologin.so 3account required /lib/security/pam_nologin.so
4account required /lib/security/pam_pwdb.so 4account required /lib/security/pam_pwdb.so
5password required /lib/security/pam_cracklib.so 5password required /lib/security/pam_cracklib.so
6password required /lib/security/pam_pwdb.so shadow nullok use_authtok 6password required /lib/security/pam_pwdb.so shadow nullok use_authtok
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam
index e48607766..ffa5adbe5 100644
--- a/contrib/redhat/sshd.pam
+++ b/contrib/redhat/sshd.pam
@@ -1,6 +1,6 @@
1#%PAM-1.0 1#%PAM-1.0
2auth required pam_stack.so service=system-auth 2auth required pam_stack.so service=system-auth
3auth required pam_nologin.so 3account required pam_nologin.so
4account required pam_stack.so service=system-auth 4account required pam_stack.so service=system-auth
5password required pam_stack.so service=system-auth 5password required pam_stack.so service=system-auth
6session required pam_stack.so service=system-auth 6session required pam_stack.so service=system-auth
diff --git a/contrib/sshd.pam.generic b/contrib/sshd.pam.generic
index cf5af3024..215f0fe30 100644
--- a/contrib/sshd.pam.generic
+++ b/contrib/sshd.pam.generic
@@ -1,6 +1,6 @@
1#%PAM-1.0 1#%PAM-1.0
2auth required /lib/security/pam_unix.so shadow nodelay 2auth required /lib/security/pam_unix.so shadow nodelay
3auth required /lib/security/pam_nologin.so 3account required /lib/security/pam_nologin.so
4account required /lib/security/pam_unix.so 4account required /lib/security/pam_unix.so
5password required /lib/security/pam_cracklib.so 5password required /lib/security/pam_cracklib.so
6password required /lib/security/pam_unix.so shadow nullok use_authtok 6password required /lib/security/pam_unix.so shadow nullok use_authtok