diff options
| author |   djm <djm@openbsd.org> | 2014-10-08 22:20:25 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2014-10-08 22:20:25 +0000 |
| commit | 4810ff27d4f3e1b19d533bbc6fbe9a85139bf143 (patch) | |
| tree | d2d9842943bd86699470e8c1ee995e0a1e3fb495 /usr.bin/ssh/ssh-keysign.c | |
| parent | Add tests for EOF behavior (which currently fail) and expected output. (diff) | |
| download | wireguard-openbsd-4810ff27d4f3e1b19d533bbc6fbe9a85139bf143.tar.xz wireguard-openbsd-4810ff27d4f3e1b19d533bbc6fbe9a85139bf143.zip | |
Tweak config reparsing with host canonicalisation
Make the second pass through the config files always run when
hostname canonicalisation is enabled.
Add a "Match canonical" criteria that allows ssh_config Match
blocks to trigger only in the second config pass.
Add a -G option to ssh that causes it to parse its configuration
and dump the result to stdout, similar to "sshd -T"
Allow ssh_config Port options set in the second config parse
phase to be applied (they were being ignored).
bz#2267 bz#2286; ok markus
Diffstat (limited to 'usr.bin/ssh/ssh-keysign.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keysign.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keysign.c b/usr.bin/ssh/ssh-keysign.c index 1da6eb7adce..79127adb073 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.42 2014/04/29 18:01:49 markus Exp $ */ +/* $OpenBSD: ssh-keysign.c,v 1.43 2014/10/08 22:20:25 djm Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -178,7 +178,7 @@ 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); fill_default_options(&options); if (options.enable_ssh_keysign != 1) fatal("ssh-keysign not enabled in %s", |