diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-04-18 18:56:16 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-05-08 18:42:03 +1000 |
commit | e826bbcafe26dac349a8593da5569e82faa45ab8 (patch) | |
tree | c5518bd5996bf258819c31ad07035588e752134a /sshd.c | |
parent | 5696512d7ad57e85e89f8011ce8dec617be686aa (diff) |
upstream: When running sshd -T, assume any attibute not provided by
-C does not match, which allows it to work when sshd_config contains a Match
directive with or without -C. bz#2858, ok djm@
OpenBSD-Commit-ID: 1a701f0a33e3bc96753cfda2fe0b0378520b82eb
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.533 2019/03/01 02:32:39 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.534 2019/04/18 18:56:16 dtucker 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 |
@@ -1843,6 +1843,7 @@ main(int ac, char **av) | |||
1843 | */ | 1843 | */ |
1844 | if (connection_info == NULL) | 1844 | if (connection_info == NULL) |
1845 | connection_info = get_connection_info(ssh, 0, 0); | 1845 | connection_info = get_connection_info(ssh, 0, 0); |
1846 | connection_info->test = 1; | ||
1846 | parse_server_match_config(&options, connection_info); | 1847 | parse_server_match_config(&options, connection_info); |
1847 | dump_config(&options); | 1848 | dump_config(&options); |
1848 | } | 1849 | } |