diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-11-23 06:08:07 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-11-23 06:09:12 +0100 |
| commit | 9e34e0c59ab04514f9de9934a772283f7f372afe (patch) | |
| tree | 4306e1438b1efe0283b635d4d4ed1256cff0fe59 /readconf.h | |
| parent | upstream: Remove now-unneeded ifdef SIGINFO around handler since it is (diff) | |
| download | openssh-9e34e0c59ab04514f9de9934a772283f7f372afe.tar.xz openssh-9e34e0c59ab04514f9de9934a772283f7f372afe.zip | |
upstream: add a ssh_config "Match final" predicate
Matches in same pass as "Match canonical" but doesn't require
hostname canonicalisation be enabled. bz#2906 ok markus
OpenBSD-Commit-ID: fba1dfe9f6e0cabcd0e2b3be13f7a434199beffa
Diffstat (limited to 'readconf.h')
| -rw-r--r-- | readconf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/readconf.h b/readconf.h index fc7e38251..8e36bf32a 100644 --- a/readconf.h +++ b/readconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.128 2018/09/20 03:30:44 djm Exp $ */ +/* $OpenBSD: readconf.h,v 1.129 2018/11/23 05:08:07 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -185,7 +185,7 @@ typedef struct { #define SSHCONF_CHECKPERM 1 /* check permissions on config file */ #define SSHCONF_USERCONF 2 /* user provided config file not system */ -#define SSHCONF_POSTCANON 4 /* After hostname canonicalisation */ +#define SSHCONF_FINAL 4 /* Final pass over config, after canon. */ #define SSHCONF_NEVERMATCH 8 /* Match/Host never matches; internal only */ #define SSH_UPDATE_HOSTKEYS_NO 0 @@ -203,7 +203,7 @@ void fill_default_options_for_canonicalization(Options *); int process_config_line(Options *, struct passwd *, const char *, const char *, char *, const char *, int, int *, int); int read_config_file(const char *, struct passwd *, const char *, - const char *, Options *, int); + const char *, Options *, int, int *); int parse_forward(struct Forward *, const char *, int, int); int parse_jump(const char *, Options *, int); int parse_ssh_uri(const char *, char **, char **, int *); |