diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2014-10-09 00:20:25 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-10-13 02:41:48 +0200 |
| commit | 957fbceb0f3166e41b76fdb54075ab3b9cc84cba (patch) | |
| tree | 7c8bc1f0090201400383e51d84a7fda79995e513 /ssh-keysign.c | |
| parent | upstream commit (diff) | |
| download | openssh-957fbceb0f3166e41b76fdb54075ab3b9cc84cba.tar.xz openssh-957fbceb0f3166e41b76fdb54075ab3b9cc84cba.zip | |
upstream commit
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 'ssh-keysign.c')
| -rw-r--r-- | ssh-keysign.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index d95bb7d9d..6b73319e0 100644 --- a/ssh-keysign.c +++ b/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. * @@ -187,7 +187,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", |