diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | readconf.c | 3 | ||||
-rw-r--r-- | ssh.c | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -19,6 +19,9 @@ | |||
19 | [readconf.c] | 19 | [readconf.c] |
20 | Hostname may have %h sequences that should be expanded prior to Match | 20 | Hostname may have %h sequences that should be expanded prior to Match |
21 | evaluation; spotted by Iain Morgan | 21 | evaluation; spotted by Iain Morgan |
22 | - djm@cvs.openbsd.org 2013/10/23 03:05:19 | ||
23 | [readconf.c ssh.c] | ||
24 | comment | ||
22 | 25 | ||
23 | 20131018 | 26 | 20131018 |
24 | - (djm) OpenBSD CVS Sync | 27 | - (djm) OpenBSD CVS Sync |
diff --git a/readconf.c b/readconf.c index dad249007..f18666786 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.211 2013/10/23 03:03:07 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.212 2013/10/23 03:05:19 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 |
@@ -470,6 +470,7 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw, | |||
470 | port = options->port <= 0 ? default_ssh_port() : options->port; | 470 | port = options->port <= 0 ? default_ssh_port() : options->port; |
471 | ruser = options->user == NULL ? pw->pw_name : options->user; | 471 | ruser = options->user == NULL ? pw->pw_name : options->user; |
472 | if (options->hostname != NULL) { | 472 | if (options->hostname != NULL) { |
473 | /* NB. Please keep in sync with ssh.c:main() */ | ||
473 | host = percent_expand(options->hostname, | 474 | host = percent_expand(options->hostname, |
474 | "h", host_arg, (char *)NULL); | 475 | "h", host_arg, (char *)NULL); |
475 | } else | 476 | } else |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.388 2013/10/17 00:46:49 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.389 2013/10/23 03:05:19 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 |
@@ -900,6 +900,7 @@ main(int ac, char **av) | |||
900 | 900 | ||
901 | /* preserve host name given on command line for %n expansion */ | 901 | /* preserve host name given on command line for %n expansion */ |
902 | if (options.hostname != NULL) { | 902 | if (options.hostname != NULL) { |
903 | /* NB. Please keep in sync with readconf.c:match_cfg_line() */ | ||
903 | cp = percent_expand(options.hostname, | 904 | cp = percent_expand(options.hostname, |
904 | "h", host, (char *)NULL); | 905 | "h", host, (char *)NULL); |
905 | free(host); | 906 | free(host); |