diff options
author | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
commit | fd0f611b70a83d80fe8793af785542ee5541b7cd (patch) | |
tree | bededd22bb7eeec52e20083237ab7e4113445a16 /contrib/redhat | |
parent | c44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff) | |
parent | ebd2ce335af5861020c79fddb1ae35c03bf036cf (diff) |
Merge 3.9p1 to the trunk.
Diffstat (limited to 'contrib/redhat')
-rw-r--r-- | contrib/redhat/openssh.spec | 4 | ||||
-rw-r--r-- | contrib/redhat/sshd.pam | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index b7470092b..f8a91f2c2 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 3.8.1p1 | 1 | %define ver 3.9p1 |
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 |
@@ -74,7 +74,7 @@ Release: %{rel} | |||
74 | %endif | 74 | %endif |
75 | URL: http://www.openssh.com/portable.html | 75 | URL: http://www.openssh.com/portable.html |
76 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz | 76 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz |
77 | Source1: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz | 77 | Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz |
78 | License: BSD | 78 | License: BSD |
79 | Group: Applications/Internet | 79 | Group: Applications/Internet |
80 | BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot | 80 | BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot |
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam index 24f3b4651..e48607766 100644 --- a/contrib/redhat/sshd.pam +++ b/contrib/redhat/sshd.pam | |||
@@ -4,5 +4,3 @@ auth required pam_nologin.so | |||
4 | account required pam_stack.so service=system-auth | 4 | account required pam_stack.so service=system-auth |
5 | password required pam_stack.so service=system-auth | 5 | password required pam_stack.so service=system-auth |
6 | session required pam_stack.so service=system-auth | 6 | session required pam_stack.so service=system-auth |
7 | session required pam_limits.so | ||
8 | session optional pam_console.so | ||