summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config.538
2 files changed, 21 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index c765bceab..38082e9c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 need to list unqualified names alongside fully-qualified ones (and this 13 need to list unqualified names alongside fully-qualified ones (and this
14 causes a number of problems). 14 causes a number of problems).
15 "looks fine" markus@ 15 "looks fine" markus@
16 - jmc@cvs.openbsd.org 2013/10/16 06:42:25
17 [ssh_config.5]
18 tweak previous;
16 19
1720131015 2020131015
18 - (djm) OpenBSD CVS Sync 21 - (djm) OpenBSD CVS Sync
diff --git a/ssh_config.5 b/ssh_config.5
index 3c1f87bef..2c0e66556 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.171 2013/10/16 02:31:46 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.172 2013/10/16 06:42:25 jmc Exp $
37.Dd $Mdocdate: October 16 2013 $ 37.Dd $Mdocdate: October 16 2013 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
@@ -201,15 +201,15 @@ Note that this option does not work if
201is set to 201is set to
202.Dq yes . 202.Dq yes .
203.It Cm CanonicalDomains 203.It Cm CanonicalDomains
204when 204When
205.Cm CanonicaliseHostname 205.Cm CanonicaliseHostname
206is enabled, this option specifies the list of domain suffixes in which to 206is enabled, this option specifies the list of domain suffixes in which to
207search for the specified destination host. 207search for the specified destination host.
208.It Cm CanonicaliseFallbackLocal 208.It Cm CanonicaliseFallbackLocal
209specified whether to fail with an error when hostname canonicalisation fails. 209Specifies whether to fail with an error when hostname canonicalisation fails.
210The default of 210The default,
211.Dq no 211.Dq no ,
212will attempt to lookup the unqualified hostname using the system resolver's 212will attempt to look up the unqualified hostname using the system resolver's
213search rules. 213search rules.
214A value of 214A value of
215.Dq yes 215.Dq yes
@@ -221,9 +221,9 @@ is enabled and the target hostname cannot be found in any of the domains
221specified by 221specified by
222.Cm CanonicalDomains . 222.Cm CanonicalDomains .
223.It Cm CanonicaliseHostname 223.It Cm CanonicaliseHostname
224controls whether explicit hostname canonicalisation is performed. 224Controls whether explicit hostname canonicalisation is performed.
225The default 225The default,
226.Dq no 226.Dq no ,
227is not to perform any name rewriting and let the system resolver handle all 227is not to perform any name rewriting and let the system resolver handle all
228hostname lookups. 228hostname lookups.
229If set to 229If set to
@@ -241,26 +241,24 @@ If
241.Cm CanonicaliseHostname 241.Cm CanonicaliseHostname
242is set to 242is set to
243.Dq always , 243.Dq always ,
244then canonicalisation is applied to proxied connections to. 244then canonicalisation is applied to proxied connections too.
245.It Cm CanonicaliseMaxDots 245.It Cm CanonicaliseMaxDots
246specifies the maximum number of dot characters in a hostname name before 246Specifies the maximum number of dot characters in a hostname before
247canonicalisation is disabled. 247canonicalisation is disabled.
248The default of 248The default,
249.Dq 1 249.Dq 1 ,
250allows a single dot (i.e. hostname.subdomain) 250allows a single dot (i.e. hostname.subdomain).
251.It Cm CanonicalisePermittedCNAMEs 251.It Cm CanonicalisePermittedCNAMEs
252specifies rules to determine whether CNAMEs should be followed when 252Specifies rules to determine whether CNAMEs should be followed when
253canonicalising hostnames. 253canonicalising hostnames.
254The rules consist of one or more arguments of 254The rules consist of one or more arguments of
255.Sm off 255.Ar source_domain_list : Ns Ar target_domain_list ,
256.Ar source_domain_list : Ar target_domain_list
257.Sm on
258where 256where
259.Ar source_domain_list 257.Ar source_domain_list
260is a pattern-list of domains that are may follow CNAMEs in canonicalisation 258is a pattern-list of domains that may follow CNAMEs in canonicalisation,
261and 259and
262.Ar target_domain_list 260.Ar target_domain_list
263is a pattern-list of domains that they may resove to. 261is a pattern-list of domains that they may resolve to.
264.Pp 262.Pp
265For example, 263For example,
266.Dq *.a.example.com:*.b.example.com,*.c.example.com 264.Dq *.a.example.com:*.b.example.com,*.c.example.com