diff options
author | djm@openbsd.org <djm@openbsd.org> | 2014-10-08 22:20:25 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-10-13 11:41:48 +1100 |
commit | 957fbceb0f3166e41b76fdb54075ab3b9cc84cba (patch) | |
tree | 7c8bc1f0090201400383e51d84a7fda79995e513 /ssh-pkcs11-helper.c | |
parent | 5c0dafd38bf66feeeb45fa0741a5baf5ad8039ba (diff) |
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-pkcs11-helper.c')
0 files changed, 0 insertions, 0 deletions