From 51682faa599550a69d8120e5e2bdbdc0625ef4be Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 17 Oct 2013 11:48:31 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2013/10/16 22:58:01 [ssh.c ssh_config.5] one I missed in previous: s/isation/ization/ --- ChangeLog | 3 +++ ssh.c | 12 ++++++------ ssh_config.5 | 14 +++++++------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6935b5cad..0accc41e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,9 @@ [readconf.c readconf.h ssh.1 ssh.c ssh_config.5] s/canonicalise/canonicalize/ for consistency with existing spelling, e.g. authorized_keys; pointed out by naddy@ + - djm@cvs.openbsd.org 2013/10/16 22:58:01 + [ssh.c ssh_config.5] + one I missed in previous: s/isation/ization/ 20131015 - (djm) OpenBSD CVS Sync diff --git a/ssh.c b/ssh.c index 6581e57bf..935390726 100644 --- a/ssh.c +++ b/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.386 2013/10/16 22:49:39 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.387 2013/10/16 22:58:01 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -303,8 +303,8 @@ check_follow_cname(char **namep, const char *cname) /* * Attempt to resolve the supplied hostname after applying the user's - * canonicalisation rules. Returns the address list for the host or NULL - * if no name was found after canonicalisation. + * canonicalization rules. Returns the address list for the host or NULL + * if no name was found after canonicalization. */ static struct addrinfo * resolve_canonicalize(char **hostp, u_int port) @@ -322,7 +322,7 @@ resolve_canonicalize(char **hostp, u_int port) if (options.proxy_command != NULL && options.canonicalize_hostname != SSH_CANONICALISE_ALWAYS) return NULL; - /* Don't apply canonicalisation to sufficiently-qualified hostnames */ + /* Don't apply canonicalization to sufficiently-qualified hostnames */ ndots = 0; for (cp = *hostp; *cp != '\0'; cp++) { if (*cp == '.') @@ -906,11 +906,11 @@ main(int ac, char **av) host = cp; } - /* If canonicalisation requested then try to apply it */ + /* If canonicalization requested then try to apply it */ if (options.canonicalize_hostname != SSH_CANONICALISE_NO) addrs = resolve_canonicalize(&host, options.port); /* - * If canonicalisation not requested, or if it failed then try to + * If canonicalization not requested, or if it failed then try to * resolve the bare hostname name using the system resolver's usual * search rules. */ diff --git a/ssh_config.5 b/ssh_config.5 index 586db6b9f..c99678f6f 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,7 +33,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. .\" -.\" $OpenBSD: ssh_config.5,v 1.173 2013/10/16 22:49:39 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.174 2013/10/16 22:58:01 djm Exp $ .Dd $Mdocdate: October 16 2013 $ .Dt SSH_CONFIG 5 .Os @@ -206,7 +206,7 @@ When is enabled, this option specifies the list of domain suffixes in which to search for the specified destination host. .It Cm CanonicalizeFallbackLocal -Specifies whether to fail with an error when hostname canonicalisation fails. +Specifies whether to fail with an error when hostname canonicalization fails. The default, .Dq no , will attempt to look up the unqualified hostname using the system resolver's @@ -221,7 +221,7 @@ is enabled and the target hostname cannot be found in any of the domains specified by .Cm CanonicalDomains . .It Cm CanonicalizeHostname -Controls whether explicit hostname canonicalisation is performed. +Controls whether explicit hostname canonicalization is performed. The default, .Dq no , is not to perform any name rewriting and let the system resolver handle all @@ -241,10 +241,10 @@ If .Cm CanonicalizeHostname is set to .Dq always , -then canonicalisation is applied to proxied connections too. +then canonicalization is applied to proxied connections too. .It Cm CanonicalizeMaxDots Specifies the maximum number of dot characters in a hostname before -canonicalisation is disabled. +canonicalization is disabled. The default, .Dq 1 , allows a single dot (i.e. hostname.subdomain). @@ -255,7 +255,7 @@ The rules consist of one or more arguments of .Ar source_domain_list : Ns Ar target_domain_list , where .Ar source_domain_list -is a pattern-list of domains that may follow CNAMEs in canonicalisation, +is a pattern-list of domains that may follow CNAMEs in canonicalization, and .Ar target_domain_list is a pattern-list of domains that they may resolve to. @@ -1423,7 +1423,7 @@ Patterns within pattern-lists may be negated by preceding them with an exclamation mark .Pq Sq !\& . For example, -to allow a key to be used from anywhere within an organisation +to allow a key to be used from anywhere within an organization except from the .Dq dialup pool,