- djm@cvs.openbsd.org 2013/10/20 09:51:26

[scp.1 sftp.1] add canonicalisation options to -o lists
author: Damien Miller <djm@mindrot.org> 2013-10-23 16:29:59 +1100
committer: Damien Miller <djm@mindrot.org> 2013-10-23 16:29:59 +1100
commit: c0049bd0bca02890cd792babc594771c563f91f2 (patch)
tree: 7de447b345514ff7872921ecd9b7505ff9972000
parent: 8a04be795fc28514a09e55a54b2e67968f2e1b3a (diff)
3 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ac04cf214..1b920b197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
     "exec"; it's shorter, clearer in intent and we might want to add the
     ability to match against the command being executed at the remote end in
     the future.
+   - djm@cvs.openbsd.org 2013/10/20 09:51:26
+     [scp.1 sftp.1]
+     add canonicalisation options to -o lists
 20131018
 - (djm) OpenBSD CVS Sync
diff --git a/scp.1 b/scp.1
index 595db3260..3b67cff0e 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.60 2013/08/14 08:39:27 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.61 2013/10/20 09:51:26 djm Exp $
 .\"
-.Dd $Mdocdate: August 14 2013 $
+.Dd $Mdocdate: October 20 2013 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -130,6 +130,11 @@ For full details of the options listed below, and their possible values, see
 .It AddressFamily
 .It BatchMode
 .It BindAddress
+.It CanonicalDomains
+.It CanonicalizeFallbackLocal
+.It CanonicalizeHostname
+.It CanonicalizeMaxDots
+.It CanonicalizePermittedCNAMEs
 .It ChallengeResponseAuthentication
 .It CheckHostIP
 .It Cipher
diff --git a/sftp.1 b/sftp.1
index c5e30504f..a700c2adb 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.96 2013/10/17 07:35:48 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.97 2013/10/20 09:51:26 djm Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 17 2013 $
+.Dd $Mdocdate: October 20 2013 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -193,6 +193,11 @@ For full details of the options listed below, and their possible values, see
 .It AddressFamily
 .It BatchMode
 .It BindAddress
+.It CanonicalDomains
+.It CanonicalizeFallbackLocal
+.It CanonicalizeHostname
+.It CanonicalizeMaxDots
+.It CanonicalizePermittedCNAMEs
 .It ChallengeResponseAuthentication
 .It CheckHostIP
 .It Cipher
author	Damien Miller <djm@mindrot.org>	2013-10-23 16:29:59 +1100
committer	Damien Miller <djm@mindrot.org>	2013-10-23 16:29:59 +1100
commit	c0049bd0bca02890cd792babc594771c563f91f2 (patch)
tree	7de447b345514ff7872921ecd9b7505ff9972000
parent	8a04be795fc28514a09e55a54b2e67968f2e1b3a (diff)

diff --git a/ChangeLog b/ChangeLog index ac04cf214..1b920b197 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -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


diff --git a/scp.1 b/scp.1 index 595db3260..3b67cff0e 100644 --- a/scp.1 +++ b/scp.1
@@ -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


diff --git a/sftp.1 b/sftp.1 index c5e30504f..a700c2adb 100644 --- a/sftp.1 +++ b/sftp.1
@@ -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