diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | scp.1 | 9 | ||||
-rw-r--r-- | sftp.1 | 9 |
3 files changed, 17 insertions, 4 deletions
@@ -9,6 +9,9 @@ | |||
9 | "exec"; it's shorter, clearer in intent and we might want to add the | 9 | "exec"; it's shorter, clearer in intent and we might want to add the |
10 | ability to match against the command being executed at the remote end in | 10 | ability to match against the command being executed at the remote end in |
11 | the future. | 11 | the future. |
12 | - djm@cvs.openbsd.org 2013/10/20 09:51:26 | ||
13 | [scp.1 sftp.1] | ||
14 | add canonicalisation options to -o lists | ||
12 | 15 | ||
13 | 20131018 | 16 | 20131018 |
14 | - (djm) OpenBSD CVS Sync | 17 | - (djm) OpenBSD CVS Sync |
@@ -8,9 +8,9 @@ | |||
8 | .\" | 8 | .\" |
9 | .\" Created: Sun May 7 00:14:37 1995 ylo | 9 | .\" Created: Sun May 7 00:14:37 1995 ylo |
10 | .\" | 10 | .\" |
11 | .\" $OpenBSD: scp.1,v 1.60 2013/08/14 08:39:27 jmc Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.61 2013/10/20 09:51:26 djm Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: August 14 2013 $ | 13 | .Dd $Mdocdate: October 20 2013 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -130,6 +130,11 @@ For full details of the options listed below, and their possible values, see | |||
130 | .It AddressFamily | 130 | .It AddressFamily |
131 | .It BatchMode | 131 | .It BatchMode |
132 | .It BindAddress | 132 | .It BindAddress |
133 | .It CanonicalDomains | ||
134 | .It CanonicalizeFallbackLocal | ||
135 | .It CanonicalizeHostname | ||
136 | .It CanonicalizeMaxDots | ||
137 | .It CanonicalizePermittedCNAMEs | ||
133 | .It ChallengeResponseAuthentication | 138 | .It ChallengeResponseAuthentication |
134 | .It CheckHostIP | 139 | .It CheckHostIP |
135 | .It Cipher | 140 | .It Cipher |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.96 2013/10/17 07:35:48 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.97 2013/10/20 09:51:26 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -22,7 +22,7 @@ | |||
22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | .\" | 24 | .\" |
25 | .Dd $Mdocdate: October 17 2013 $ | 25 | .Dd $Mdocdate: October 20 2013 $ |
26 | .Dt SFTP 1 | 26 | .Dt SFTP 1 |
27 | .Os | 27 | .Os |
28 | .Sh NAME | 28 | .Sh NAME |
@@ -193,6 +193,11 @@ For full details of the options listed below, and their possible values, see | |||
193 | .It AddressFamily | 193 | .It AddressFamily |
194 | .It BatchMode | 194 | .It BatchMode |
195 | .It BindAddress | 195 | .It BindAddress |
196 | .It CanonicalDomains | ||
197 | .It CanonicalizeFallbackLocal | ||
198 | .It CanonicalizeHostname | ||
199 | .It CanonicalizeMaxDots | ||
200 | .It CanonicalizePermittedCNAMEs | ||
196 | .It ChallengeResponseAuthentication | 201 | .It ChallengeResponseAuthentication |
197 | .It CheckHostIP | 202 | .It CheckHostIP |
198 | .It Cipher | 203 | .It Cipher |