diff options
| author | des <des@FreeBSD.org> | 2014-04-12 20:22:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-04-12 20:22:59 +0000 |
| commit | faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5 (patch) | |
| tree | 1869bb83deee7739b988ace790deca83cd513254 /crypto/openssh/ssh_config.5 | |
| parent | 0918f176a2a27c20190030f7d90050e0b1a8e25c (diff) | |
| download | FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.zip FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.tar.gz | |
MFH (r263712): upgrade openssh to 6.6p1
MFH (r264308): restore p level in debugging output
Diffstat (limited to 'crypto/openssh/ssh_config.5')
| -rw-r--r-- | crypto/openssh/ssh_config.5 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index a7728ca..1c681f3 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -33,9 +33,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.184 2014/01/19 04:48:08 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.185 2014/02/23 20:11:36 djm Exp $ .\" $FreeBSD$ -.Dd January 19, 2014 +.Dd February 23, 2014 .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -264,6 +264,12 @@ If is set to .Dq always , then canonicalization is applied to proxied connections too. +.Pp +If this option is enabled and canonicalisation results in the target hostname +changing, then the configuration files are processed again using the new +target name to pick up any new configuration in matching +.Cm Host +stanzas. .It Cm CanonicalizeMaxDots Specifies the maximum number of dot characters in a hostname before canonicalization is disabled. @@ -1417,7 +1423,7 @@ See also VERIFYING HOST KEYS in Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq FreeBSD-20140130 . +.Dq FreeBSD-20140324 . .It Cm VisualHostKey If this flag is set to .Dq yes , |
