summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS1
-rw-r--r--ChangeLog1
-rw-r--r--contrib/redhat/openssh.spec16
-rw-r--r--sftp-server.83
4 files changed, 12 insertions, 9 deletions
diff --git a/CREDITS b/CREDITS
index 63dc64add..0bae5a1a5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -58,6 +58,7 @@ Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch
58Nate Itkin <nitkin@europa.com> - SunOS 4.1.x fixes 58Nate Itkin <nitkin@europa.com> - SunOS 4.1.x fixes
59Niels Kristian Bech Jensen <nkbj@image.dk> - Assorted patches 59Niels Kristian Bech Jensen <nkbj@image.dk> - Assorted patches
60Pavel Troller <patrol@omni.sinus.cz> - Bugfixes 60Pavel Troller <patrol@omni.sinus.cz> - Bugfixes
61Pekka Savola <pekkas@netcore.fi> - Bugfixes
61Peter Kocks <peter.kocks@baygate.com> - Makefile fixes 62Peter Kocks <peter.kocks@baygate.com> - Makefile fixes
62Phil Hands <phil@hands.com> - Debian scripts, assorted patches 63Phil Hands <phil@hands.com> - Debian scripts, assorted patches
63Phil Karn <karn@ka9q.ampr.org> - Autoconf fix 64Phil Karn <karn@ka9q.ampr.org> - Autoconf fix
diff --git a/ChangeLog b/ChangeLog
index 9a8a3965e..ef8407e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120000923 120000923
2 - (djm) Fix address logging in utmp from Kevin Steves 2 - (djm) Fix address logging in utmp from Kevin Steves
3 <stevesk@sweden.hp.com> 3 <stevesk@sweden.hp.com>
4 - (djm) Redhat spec and manpage fixes from Pekka Savola <pekkas@netcore.fi>
4 5
520000920 620000920
6 - (djm) Fix bad path substitution. Report from Andrew Miner 7 - (djm) Fix bad path substitution. Report from Andrew Miner
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 37316d21e..3bf444352 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -227,8 +227,8 @@ fi
227%doc CREDITS UPGRADING 227%doc CREDITS UPGRADING
228%attr(0755,root,root) /usr/bin/ssh-keygen 228%attr(0755,root,root) /usr/bin/ssh-keygen
229%attr(0755,root,root) /usr/bin/scp 229%attr(0755,root,root) /usr/bin/scp
230%attr(0644,root,root) /usr/man/man1/ssh-keygen.1* 230%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
231%attr(0644,root,root) /usr/man/man1/scp.1* 231%attr(0644,root,root) %{_mandir}/man1/scp.1*
232%attr(0755,root,root) %dir /etc/ssh 232%attr(0755,root,root) %dir /etc/ssh
233%attr(0755,root,root) %dir /usr/libexec/openssh 233%attr(0755,root,root) %dir /usr/libexec/openssh
234 234
@@ -237,17 +237,19 @@ fi
237%attr(4755,root,root) /usr/bin/ssh 237%attr(4755,root,root) /usr/bin/ssh
238%attr(0755,root,root) /usr/bin/ssh-agent 238%attr(0755,root,root) /usr/bin/ssh-agent
239%attr(0755,root,root) /usr/bin/ssh-add 239%attr(0755,root,root) /usr/bin/ssh-add
240%attr(0644,root,root) /usr/man/man1/ssh.1* 240%attr(0644,root,root) %{_mandir}/man1/ssh.1*
241%attr(0644,root,root) /usr/man/man1/ssh-agent.1* 241%attr(0644,root,root) %{_mandir}/man1/ssh-agent.1*
242%attr(0644,root,root) /usr/man/man1/ssh-add.1* 242%attr(0644,root,root) %{_mandir}/man1/ssh-add.1*
243%attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config 243%attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config
244%attr(-,root,root) /usr/bin/slogin 244%attr(-,root,root) /usr/bin/slogin
245%attr(-,root,root) /usr/man/man1/slogin.1* 245%attr(-,root,root) %{_mandir}/man1/slogin.1*
246 246
247%files server 247%files server
248%defattr(-,root,root) 248%defattr(-,root,root)
249%attr(0755,root,root) /usr/sbin/sshd 249%attr(0755,root,root) /usr/sbin/sshd
250%attr(0644,root,root) /usr/man/man8/sshd.8* 250%attr(0755,root,root) /usr/libexec/openssh/sftp-server
251%attr(0644,root,root) %{_mandir}/man8/sshd.8*
252%attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
251%attr(0600,root,root) %config(noreplace) /etc/ssh/sshd_config 253%attr(0600,root,root) %config(noreplace) /etc/ssh/sshd_config
252%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd 254%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
253%attr(0755,root,root) %config /etc/rc.d/init.d/sshd 255%attr(0755,root,root) %config /etc/rc.d/init.d/sshd
diff --git a/sftp-server.8 b/sftp-server.8
index 9811a3b42..59c997c3f 100644
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -45,8 +45,7 @@ See
45for more information. 45for more information.
46.Sh HISTORY 46.Sh HISTORY
47.Nm 47.Nm
48first appeared in 48first appeared in OpenBSD 2.8.
49.Ox 2.8 .
50.Sh AUTHOR 49.Sh AUTHOR
51Markus Friedl <markus@openbsd.org> 50Markus Friedl <markus@openbsd.org>
52.Sh SEE ALSO 51.Sh SEE ALSO