summaryrefslogtreecommitdiff
path: root/ssh-keyscan.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r--ssh-keyscan.c10
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 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.74 2006/10/06 02:29:19 djm Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.76 2008/04/30 10:14:03 djm Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
@@ -56,7 +56,7 @@ int ssh_port = SSH_DEFAULT_PORT;
56#define KT_DSA 2 56#define KT_DSA 2
57#define KT_RSA 4 57#define KT_RSA 4
58 58
59int get_keytypes = KT_RSA1; /* Get only RSA1 keys by default */ 59int get_keytypes = KT_RSA; /* Get only RSA keys by default */
60 60
61int hash_hosts = 0; /* Hash hostname on output */ 61int hash_hosts = 0; /* Hash hostname on output */
62 62
@@ -358,7 +358,7 @@ keygrab_ssh2(con *c)
358{ 358{
359 int j; 359 int j;
360 360
361 packet_set_connection(c->c_fd, c->c_fd, timeout); 361 packet_set_connection(c->c_fd, c->c_fd);
362 enable_compat20(); 362 enable_compat20();
363 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA? 363 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA?
364 "ssh-dss": "ssh-rsa"; 364 "ssh-dss": "ssh-rsa";
@@ -410,7 +410,7 @@ tcpconnect(char *host)
410 hints.ai_family = IPv4or6; 410 hints.ai_family = IPv4or6;
411 hints.ai_socktype = SOCK_STREAM; 411 hints.ai_socktype = SOCK_STREAM;
412 if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0) 412 if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
413 fatal("getaddrinfo %s: %s", host, gai_strerror(gaierr)); 413 fatal("getaddrinfo %s: %s", host, ssh_gai_strerror(gaierr));
414 for (ai = aitop; ai; ai = ai->ai_next) { 414 for (ai = aitop; ai; ai = ai->ai_next) {
415 s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); 415 s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
416 if (s < 0) { 416 if (s < 0) {
@@ -656,7 +656,7 @@ conloop(void)
656 memcpy(e, read_wait, read_wait_nfdset * sizeof(fd_mask)); 656 memcpy(e, read_wait, read_wait_nfdset * sizeof(fd_mask));
657 657
658 while (select(maxfd, r, NULL, e, &seltime) == -1 && 658 while (select(maxfd, r, NULL, e, &seltime) == -1 &&
659 (errno == EAGAIN || errno == EINTR)) 659 (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK))
660 ; 660 ;
661 661
662 for (i = 0; i < maxfd; i++) { 662 for (i = 0; i < maxfd; i++) {