diff options
author | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
commit | 915bfea2af69a3bb352a9b4e98e3434b8425124d (patch) | |
tree | ef732498a75f2e13a7a9827edc833dc58bc2a2af /contrib/redhat | |
parent | 89e7a2dfe6044f3980098911a7470d401ff70eb1 (diff) | |
parent | 16f1d21ea191deaaeeba719d01c0ad82aa044653 (diff) |
Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).
Diffstat (limited to 'contrib/redhat')
-rw-r--r-- | contrib/redhat/openssh.spec | 2 | ||||
-rw-r--r-- | contrib/redhat/sshd.pam | 14 |
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 |
2 | auth required /lib/security/pam_stack.so service=system-auth | 2 | auth required pam_stack.so service=system-auth |
3 | auth required /lib/security/pam_nologin.so | 3 | auth required pam_nologin.so |
4 | account required /lib/security/pam_stack.so service=system-auth | 4 | account required pam_stack.so service=system-auth |
5 | password required /lib/security/pam_stack.so service=system-auth | 5 | password required pam_stack.so service=system-auth |
6 | session required /lib/security/pam_stack.so service=system-auth | 6 | session required pam_stack.so service=system-auth |
7 | session required /lib/security/pam_limits.so | 7 | session required pam_limits.so |
8 | session optional /lib/security/pam_console.so | 8 | session optional pam_console.so |