summaryrefslogtreecommitdiff
path: root/contrib/redhat
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2004-05-01 11:41:25 +0000
committerColin Watson <cjwatson@debian.org>2004-05-01 11:41:25 +0000
commit915bfea2af69a3bb352a9b4e98e3434b8425124d (patch)
treeef732498a75f2e13a7a9827edc833dc58bc2a2af /contrib/redhat
parent89e7a2dfe6044f3980098911a7470d401ff70eb1 (diff)
parent16f1d21ea191deaaeeba719d01c0ad82aa044653 (diff)
Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).
Diffstat (limited to 'contrib/redhat')
-rw-r--r--contrib/redhat/openssh.spec2
-rw-r--r--contrib/redhat/sshd.pam14
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 05750e3a9..b7470092b 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
1%define ver 3.8p1 1%define ver 3.8.1p1
2%define rel 1 2%define rel 1
3 3
4# OpenSSH privilege separation requires a user & group ID 4# OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam
index d2ab073fc..24f3b4651 100644
--- a/contrib/redhat/sshd.pam
+++ b/contrib/redhat/sshd.pam
@@ -1,8 +1,8 @@
1#%PAM-1.0 1#%PAM-1.0
2auth required /lib/security/pam_stack.so service=system-auth 2auth required pam_stack.so service=system-auth
3auth required /lib/security/pam_nologin.so 3auth required pam_nologin.so
4account required /lib/security/pam_stack.so service=system-auth 4account required pam_stack.so service=system-auth
5password required /lib/security/pam_stack.so service=system-auth 5password required pam_stack.so service=system-auth
6session required /lib/security/pam_stack.so service=system-auth 6session required pam_stack.so service=system-auth
7session required /lib/security/pam_limits.so 7session required pam_limits.so
8session optional /lib/security/pam_console.so 8session optional pam_console.so