diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.386 2013/10/16 22:49:39 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.387 2013/10/16 22:58:01 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -303,8 +303,8 @@ check_follow_cname(char **namep, const char *cname) | |||
303 | 303 | ||
304 | /* | 304 | /* |
305 | * Attempt to resolve the supplied hostname after applying the user's | 305 | * Attempt to resolve the supplied hostname after applying the user's |
306 | * canonicalisation rules. Returns the address list for the host or NULL | 306 | * canonicalization rules. Returns the address list for the host or NULL |
307 | * if no name was found after canonicalisation. | 307 | * if no name was found after canonicalization. |
308 | */ | 308 | */ |
309 | static struct addrinfo * | 309 | static struct addrinfo * |
310 | resolve_canonicalize(char **hostp, u_int port) | 310 | resolve_canonicalize(char **hostp, u_int port) |
@@ -322,7 +322,7 @@ resolve_canonicalize(char **hostp, u_int port) | |||
322 | if (options.proxy_command != NULL && | 322 | if (options.proxy_command != NULL && |
323 | options.canonicalize_hostname != SSH_CANONICALISE_ALWAYS) | 323 | options.canonicalize_hostname != SSH_CANONICALISE_ALWAYS) |
324 | return NULL; | 324 | return NULL; |
325 | /* Don't apply canonicalisation to sufficiently-qualified hostnames */ | 325 | /* Don't apply canonicalization to sufficiently-qualified hostnames */ |
326 | ndots = 0; | 326 | ndots = 0; |
327 | for (cp = *hostp; *cp != '\0'; cp++) { | 327 | for (cp = *hostp; *cp != '\0'; cp++) { |
328 | if (*cp == '.') | 328 | if (*cp == '.') |
@@ -906,11 +906,11 @@ main(int ac, char **av) | |||
906 | host = cp; | 906 | host = cp; |
907 | } | 907 | } |
908 | 908 | ||
909 | /* If canonicalisation requested then try to apply it */ | 909 | /* If canonicalization requested then try to apply it */ |
910 | if (options.canonicalize_hostname != SSH_CANONICALISE_NO) | 910 | if (options.canonicalize_hostname != SSH_CANONICALISE_NO) |
911 | addrs = resolve_canonicalize(&host, options.port); | 911 | addrs = resolve_canonicalize(&host, options.port); |
912 | /* | 912 | /* |
913 | * If canonicalisation not requested, or if it failed then try to | 913 | * If canonicalization not requested, or if it failed then try to |
914 | * resolve the bare hostname name using the system resolver's usual | 914 | * resolve the bare hostname name using the system resolver's usual |
915 | * search rules. | 915 | * search rules. |
916 | */ | 916 | */ |