1 files changed, 5 insertions, 1 deletions

diff --git a/sshd.c b/sshd.c
index 6aa17fa65..60b0cd4bb 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.445 2015/03/31 22:55:24 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.446 2015/04/10 05:16:50 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -928,6 +928,10 @@ notify_hostkeys(struct ssh *ssh)
         int i, nkeys, r;
         char *fp;
 
+        /* Some clients cannot cope with the hostkeys message, skip those. */
+        if (datafellows & SSH_BUG_HOSTKEYS)
+                return;
+
         if ((buf = sshbuf_new()) == NULL)
                 fatal("%s: sshbuf_new", __func__);
         for (i = nkeys = 0; i < options.num_host_key_files; i++) {