diff options
| author |   djm <djm@openbsd.org> | 2018-11-23 05:08:07 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2018-11-23 05:08:07 +0000 |
| commit | 23f959cd6377015217bef036557c33936f50eb1f (patch) | |
| tree | cfe4201126ec3c2b9d81f3d0cb43daff91999427 /usr.bin/ssh/ssh-keysign.c | |
| parent | Remove now-unneeded ifdef SIGINFO around handler since it is now always (diff) | |
| download | wireguard-openbsd-23f959cd6377015217bef036557c33936f50eb1f.tar.xz wireguard-openbsd-23f959cd6377015217bef036557c33936f50eb1f.zip | |
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
Diffstat (limited to 'usr.bin/ssh/ssh-keysign.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keysign.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keysign.c b/usr.bin/ssh/ssh-keysign.c index f332264b1ed..7f17bb56b8b 100644 --- a/usr.bin/ssh/ssh-keysign.c +++ b/usr.bin/ssh/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. * @@ -197,7 +197,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", |