diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
commit | 78799892cb1858927be02be9737c594052e3f910 (patch) | |
tree | ac3dc2e848ab9dc62fe4252e01e52c3d456f628f /openbsd-compat/port-uw.c | |
parent | 3875951bb76a9ec62634ae4026c9cc885d933477 (diff) | |
parent | 31e30b835fd9695d3b6647cab4867001b092e28f (diff) |
* New upstream release (http://www.openssh.com/txt/release-5.6):
- Added a ControlPersist option to ssh_config(5) that automatically
starts a background ssh(1) multiplex master when connecting. This
connection can stay alive indefinitely, or can be set to automatically
close after a user-specified duration of inactivity (closes: #335697,
#350898, #454787, #500573, #550262).
- Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
Match blocks (closes: #549858).
- sftp(1): fix ls in working directories that contain globbing
characters in their pathnames (LP: #530714).
Diffstat (limited to 'openbsd-compat/port-uw.c')
-rw-r--r-- | openbsd-compat/port-uw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c index be9905a6a..b1fbfa208 100644 --- a/openbsd-compat/port-uw.c +++ b/openbsd-compat/port-uw.c | |||
@@ -39,10 +39,10 @@ | |||
39 | #include "xmalloc.h" | 39 | #include "xmalloc.h" |
40 | #include "packet.h" | 40 | #include "packet.h" |
41 | #include "buffer.h" | 41 | #include "buffer.h" |
42 | #include "key.h" | ||
42 | #include "auth-options.h" | 43 | #include "auth-options.h" |
43 | #include "log.h" | 44 | #include "log.h" |
44 | #include "servconf.h" | 45 | #include "servconf.h" |
45 | #include "key.h" | ||
46 | #include "hostfile.h" | 46 | #include "hostfile.h" |
47 | #include "auth.h" | 47 | #include "auth.h" |
48 | #include "ssh.h" | 48 | #include "ssh.h" |