diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-11-23 05:08:07 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-11-23 16:09:12 +1100 |
| commit | 9e34e0c59ab04514f9de9934a772283f7f372afe (patch) | |
| tree | 4306e1438b1efe0283b635d4d4ed1256cff0fe59 /ssh-keysign.c | |
| parent | 4da58d58736b065b1182b563d10ad6765d811c6d (diff) | |
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 'ssh-keysign.c')
| -rw-r--r-- | ssh-keysign.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index 8f487b8c..7ea5ad0e 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keysign.c,v 1.55 2018/07/27 05:34:42 dtucker Exp $ */ +/* $OpenBSD: ssh-keysign.c,v 1.56 2018/11/23 05:08:07 djm Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -208,7 +208,8 @@ main(int argc, char **argv) /* verify that ssh-keysign is enabled by the admin */ initialize_options(&options); - (void)read_config_file(_PATH_HOST_CONFIG_FILE, pw, "", "", &options, 0); + (void)read_config_file(_PATH_HOST_CONFIG_FILE, pw, "", "", + &options, 0, NULL); fill_default_options(&options); if (options.enable_ssh_keysign != 1) fatal("ssh-keysign not enabled in %s", |