1 files changed, 5 insertions, 5 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 7ffbda421..d81077764 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.74 2006/10/06 02:29:19 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.76 2008/04/30 10:14:03 djm Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -56,7 +56,7 @@ int ssh_port = SSH_DEFAULT_PORT;
 #define KT_DSA  2
 #define KT_RSA  4
 
-int get_keytypes = KT_RSA1;     /* Get only RSA1 keys by default */
+int get_keytypes = KT_RSA;      /* Get only RSA keys by default */
 
 int hash_hosts = 0;             /* Hash hostname on output */
 
@@ -358,7 +358,7 @@ keygrab_ssh2(con *c)
 {
         int j;
 
-        packet_set_connection(c->c_fd, c->c_fd, timeout);
+        packet_set_connection(c->c_fd, c->c_fd);
         enable_compat20();
         myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA?
             "ssh-dss": "ssh-rsa";
@@ -410,7 +410,7 @@ tcpconnect(char *host)
         hints.ai_family = IPv4or6;
         hints.ai_socktype = SOCK_STREAM;
         if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
-                fatal("getaddrinfo %s: %s", host, gai_strerror(gaierr));
+                fatal("getaddrinfo %s: %s", host, ssh_gai_strerror(gaierr));
         for (ai = aitop; ai; ai = ai->ai_next) {
                 s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
                 if (s < 0) {
@@ -656,7 +656,7 @@ conloop(void)
         memcpy(e, read_wait, read_wait_nfdset * sizeof(fd_mask));
 
         while (select(maxfd, r, NULL, e, &seltime) == -1 &&
-            (errno == EAGAIN || errno == EINTR))
+            (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK))
                 ;
 
         for (i = 0; i < maxfd; i++) {