Make with config keywords support which percent_expansions more consistent.

 - %C is moved into its own function and added to Match Exec.
 - move the common (global) options into a macro.  This is ugly but it's
   the least-ugly way I could come up with.
 - move IdentityAgent and ForwardAgent percent expansion to before the
   config dump to make it regression-testable.
 - document all of the above

ok jmc@ for man page bits, "makes things less terrible" djm@ for the rest.

1 files changed, 3 insertions, 1 deletions

diff --git a/usr.bin/ssh/readconf.h b/usr.bin/ssh/readconf.h
index feedb3d202c..e143a1082ae 100644
--- a/usr.bin/ssh/readconf.h
+++ b/usr.bin/ssh/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.132 2020/01/23 02:46:49 dtucker Exp $ */
+/* $OpenBSD: readconf.h,v 1.133 2020/04/03 02:27:12 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -200,6 +200,8 @@ typedef struct {
 #define SSH_STRICT_HOSTKEY_ASK	3
 
 const char *kex_default_pk_alg(void);
+char	*ssh_connection_hash(const char *thishost, const char *host,
+    const char *portstr, const char *user);
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 void	 fill_default_options_for_canonicalization(Options *);