summaryrefslogtreecommitdiff
path: root/contrib/redhat
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2009-02-24 18:49:27 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2009-02-24 18:49:27 +0000
commit9ab1052dcdca9be06dcec8abc37103a70e358e73 (patch)
treee584c257bb55edd49609ecf2750698017a03411e /contrib/redhat
parent23371b1d95849b7f55a33cad9ba00f81e822c5a1 (diff)
Vendor import of OpenSSH 5.2p1vendor/openssh/5.2p1
Notes
svn path=/vendor-crypto/openssh/dist/; revision=189006 svn path=/vendor-crypto/openssh/5.2p1/; revision=189007; tag=vendor/openssh/5.2p1
Diffstat (limited to 'contrib/redhat')
-rw-r--r--contrib/redhat/openssh.spec4
-rw-r--r--contrib/redhat/sshd.pam2
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index bb9e4d616c98..10bdc1989a34 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 5.1p1
+%define ver 5.2p1
%define rel 1
# OpenSSH privilege separation requires a user & group ID
@@ -333,7 +333,7 @@ fi
%files
%defattr(-,root,root)
-%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* RFC* TODO WARNING*
+%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* PROTOCOL* TODO WARNING*
%attr(0755,root,root) %{_bindir}/scp
%attr(0644,root,root) %{_mandir}/man1/scp.1*
%attr(0755,root,root) %dir %{_sysconfdir}/ssh
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam
index e486077661c1..ffa5adbe58e5 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