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 /servconf.h | |
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 'servconf.h')
-rw-r--r-- | servconf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index 54e0a8d8d..5483da051 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.139 2019/01/19 21:37:48 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.140 2019/04/18 18:56:16 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -221,6 +221,8 @@ struct connection_info { | |||
221 | const char *laddress; /* local address */ | 221 | const char *laddress; /* local address */ |
222 | int lport; /* local port */ | 222 | int lport; /* local port */ |
223 | const char *rdomain; /* routing domain if available */ | 223 | const char *rdomain; /* routing domain if available */ |
224 | int test; /* test mode, allow some attributes to be | ||
225 | * unspecified */ | ||
224 | }; | 226 | }; |
225 | 227 | ||
226 | 228 | ||