tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/10/16 22:58:01 

[ssh.c ssh_config.5]
     one I missed in previous: s/isation/ization/
This commit is contained in:
Damien Miller 2013-10-17 11:48:31 +11:00
parent 3850559be9
commit 51682faa59
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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

12
ssh.c
View File

@ -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 <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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.
*/

14
ssh_config.5
View File

@ -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,