upstream commit

Add a ssh_config HostbasedKeyType option to control which
 host public key types are tried during hostbased authentication.

This may be used to prevent too many keys being sent to the server,
and blowing past its MaxAuthTries limit.

bz#2211 based on patch by Iain Morgan; ok markus@

1 files changed, 3 insertions, 1 deletions

diff --git a/readconf.h b/readconf.h
index 7a8ae17c0..701b9c696 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.107 2015/01/26 03:04:45 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.108 2015/01/30 11:43:14 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -150,6 +150,8 @@ typedef struct {
 
         int      update_hostkeys;
 
+        char    *hostbased_key_types;
+
         char    *ignored_unknown; /* Pattern list of unknown tokens to ignore */
 }       Options;