- jmc@cvs.openbsd.org 2013/10/16 06:42:25

[ssh_config.5]
     tweak previous;
This commit is contained in:
Damien Miller 2013-10-17 11:47:51 +11:00
parent 0faf747e2f
commit 607af3434b
2 changed files with 21 additions and 20 deletions

View File

@ -13,6 +13,9 @@
need to list unqualified names alongside fully-qualified ones (and this need to list unqualified names alongside fully-qualified ones (and this
causes a number of problems). causes a number of problems).
"looks fine" markus@ "looks fine" markus@
- jmc@cvs.openbsd.org 2013/10/16 06:42:25
[ssh_config.5]
tweak previous;
20131015 20131015
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.171 2013/10/16 02:31:46 djm Exp $ .\" $OpenBSD: ssh_config.5,v 1.172 2013/10/16 06:42:25 jmc Exp $
.Dd $Mdocdate: October 16 2013 $ .Dd $Mdocdate: October 16 2013 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -201,15 +201,15 @@ Note that this option does not work if
is set to is set to
.Dq yes . .Dq yes .
.It Cm CanonicalDomains .It Cm CanonicalDomains
when When
.Cm CanonicaliseHostname .Cm CanonicaliseHostname
is enabled, this option specifies the list of domain suffixes in which to is enabled, this option specifies the list of domain suffixes in which to
search for the specified destination host. search for the specified destination host.
.It Cm CanonicaliseFallbackLocal .It Cm CanonicaliseFallbackLocal
specified whether to fail with an error when hostname canonicalisation fails. Specifies whether to fail with an error when hostname canonicalisation fails.
The default of The default,
.Dq no .Dq no ,
will attempt to lookup the unqualified hostname using the system resolver's will attempt to look up the unqualified hostname using the system resolver's
search rules. search rules.
A value of A value of
.Dq yes .Dq yes
@ -221,9 +221,9 @@ is enabled and the target hostname cannot be found in any of the domains
specified by specified by
.Cm CanonicalDomains . .Cm CanonicalDomains .
.It Cm CanonicaliseHostname .It Cm CanonicaliseHostname
controls whether explicit hostname canonicalisation is performed. Controls whether explicit hostname canonicalisation is performed.
The default The default,
.Dq no .Dq no ,
is not to perform any name rewriting and let the system resolver handle all is not to perform any name rewriting and let the system resolver handle all
hostname lookups. hostname lookups.
If set to If set to
@ -241,26 +241,24 @@ If
.Cm CanonicaliseHostname .Cm CanonicaliseHostname
is set to is set to
.Dq always , .Dq always ,
then canonicalisation is applied to proxied connections to. then canonicalisation is applied to proxied connections too.
.It Cm CanonicaliseMaxDots .It Cm CanonicaliseMaxDots
specifies the maximum number of dot characters in a hostname name before Specifies the maximum number of dot characters in a hostname before
canonicalisation is disabled. canonicalisation is disabled.
The default of The default,
.Dq 1 .Dq 1 ,
allows a single dot (i.e. hostname.subdomain) allows a single dot (i.e. hostname.subdomain).
.It Cm CanonicalisePermittedCNAMEs .It Cm CanonicalisePermittedCNAMEs
specifies rules to determine whether CNAMEs should be followed when Specifies rules to determine whether CNAMEs should be followed when
canonicalising hostnames. canonicalising hostnames.
The rules consist of one or more arguments of The rules consist of one or more arguments of
.Sm off .Ar source_domain_list : Ns Ar target_domain_list ,
.Ar source_domain_list : Ar target_domain_list
.Sm on
where where
.Ar source_domain_list .Ar source_domain_list
is a pattern-list of domains that are may follow CNAMEs in canonicalisation is a pattern-list of domains that may follow CNAMEs in canonicalisation,
and and
.Ar target_domain_list .Ar target_domain_list
is a pattern-list of domains that they may resove to. is a pattern-list of domains that they may resolve to.
.Pp .Pp
For example, For example,
.Dq *.a.example.com:*.b.example.com,*.c.example.com .Dq *.a.example.com:*.b.example.com,*.c.example.com