diff options
| author |   djm <djm@openbsd.org> | 2013-10-16 22:58:01 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2013-10-16 22:58:01 +0000 |
| commit | 3d18a0d89fb4827bbb69070dd70c90ca74083f53 (patch) | |
| tree | da1df708f3784229463bd10d49ad2135d8d39335 /usr.bin/ssh/ssh.c | |
| parent | s/canonicalise/canonicalize/ for consistency with existing spelling, (diff) | |
| download | wireguard-openbsd-3d18a0d89fb4827bbb69070dd70c90ca74083f53.tar.xz wireguard-openbsd-3d18a0d89fb4827bbb69070dd70c90ca74083f53.zip | |
one I missed in previous: s/isation/ization/
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 2b4ac874239..2244e62dc94 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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 <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -290,8 +290,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) @@ -309,7 +309,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 == '.') @@ -872,11 +872,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. */ |