summaryrefslogtreecommitdiff
path: root/sftp.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-18 12:16:05 +0100
committerColin Watson <cjwatson@debian.org>2012-05-18 12:16:05 +0100
commitdabbdfacc9f6995b0739772a47704186dcf34ea5 (patch)
tree0a0b306a637bc85eb719261b74884f0b9573ec41 /sftp.0
parent1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff)
parentdd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff)
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections (closes: #643312, #650512). - Add a new privilege separation sandbox implementation for Linux's new seccomp sandbox, automatically enabled on platforms that support it. (Note: privilege separation sandboxing is still experimental.)
Diffstat (limited to 'sftp.0')
-rw-r--r--sftp.04
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp.0 b/sftp.0
index f29776701..8350732d4 100644
--- a/sftp.0
+++ b/sftp.0
@@ -103,6 +103,7 @@ DESCRIPTION
103 ConnectTimeout 103 ConnectTimeout
104 ControlMaster 104 ControlMaster
105 ControlPath 105 ControlPath
106 ControlPersist
106 GlobalKnownHostsFile 107 GlobalKnownHostsFile
107 GSSAPIAuthentication 108 GSSAPIAuthentication
108 GSSAPIDelegateCredentials 109 GSSAPIDelegateCredentials
@@ -115,6 +116,7 @@ DESCRIPTION
115 IdentityFile 116 IdentityFile
116 IdentitiesOnly 117 IdentitiesOnly
117 IPQoS 118 IPQoS
119 KbdInteractiveAuthentication
118 KbdInteractiveDevices 120 KbdInteractiveDevices
119 KexAlgorithms 121 KexAlgorithms
120 LogLevel 122 LogLevel
@@ -334,4 +336,4 @@ SEE ALSO
334 draft-ietf-secsh-filexfer-00.txt, January 2001, work in progress 336 draft-ietf-secsh-filexfer-00.txt, January 2001, work in progress
335 material. 337 material.
336 338
337OpenBSD 5.0 August 7, 2011 OpenBSD 5.0 339OpenBSD 5.0 September 5, 2011 OpenBSD 5.0