upstream commit

set a timeout to prevent hangs when talking to busted
 servers; ok markus@

1 files changed, 2 insertions, 1 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 989f7ecce..2b1303026 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.98 2015/01/30 01:13:33 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.99 2015/01/30 10:44:49 djm Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -468,6 +468,7 @@ congreet(int s)
         *cp = '\0';
         if ((c->c_ssh = ssh_packet_set_connection(NULL, s, s)) == NULL)
                 fatal("ssh_packet_set_connection failed");
+        ssh_packet_set_timeout(c->c_ssh, timeout, 1);
         ssh_set_app_data(c->c_ssh, c);  /* back link */
         if (sscanf(buf, "SSH-%d.%d-%[^\n]\n",
             &remote_major, &remote_minor, remote_version) == 3)