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