tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
don't attempt to percent_expand() already-canonicalised
 addresses, avoiding unnecessary failures when attempting to connect to scoped
 IPv6 addresses (that naturally contain '%' characters)

Upstream-ID: f24569cffa1a7cbde5f08dc739a72f4d78aa5c6a
This commit is contained in:
djm@openbsd.org 2016-02-08 23:40:12 +00:00 committed by Damien Miller
parent 19bcf2ea2d
commit 5a622844ff
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.249 2016/01/29 02:54:45 dtucker Exp $ */ /* $OpenBSD: readconf.c,v 1.250 2016/02/08 23:40:12 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -522,12 +522,15 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
*/ */
port = options->port <= 0 ? default_ssh_port() : options->port; port = options->port <= 0 ? default_ssh_port() : options->port;
ruser = options->user == NULL ? pw->pw_name : options->user; ruser = options->user == NULL ? pw->pw_name : options->user;
if (options->hostname != NULL) { if (post_canon) {
host = xstrdup(options->hostname);
} else if (options->hostname != NULL) {
/* NB. Please keep in sync with ssh.c:main() */ /* NB. Please keep in sync with ssh.c:main() */
host = percent_expand(options->hostname, host = percent_expand(options->hostname,
"h", host_arg, (char *)NULL); "h", host_arg, (char *)NULL);
} else } else {
host = xstrdup(host_arg); host = xstrdup(host_arg);
}
debug2("checking match for '%s' host %s originally %s", debug2("checking match for '%s' host %s originally %s",
cp, host, original_host); cp, host, original_host);