summaryrefslogtreecommitdiffstats
path: root/channels.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-10 21:45:12 +1100
committerDamien Miller <djm@mindrot.org>2003-01-10 21:45:12 +1100
commitb46b9f322d82a7c912e6e15dbd8a73261acf2991 (patch)
tree843b6e8ad5043a9ff1e37fbfa4df11881a2aaddd /channels.c
parent86b781c179911d609bd0e3cfa3992f510cd56413 (diff)
- djm@cvs.openbsd.org 2003/01/10 10:32:54
[channels.c] hush socket() errors, except last. Fixes mindrot bug #408; ok markus@
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/channels.c b/channels.c
index 2fb22f7c..ea1d46c2 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.185 2003/01/01 18:08:52 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.186 2003/01/10 10:32:54 djm Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -2281,7 +2281,10 @@ connect_to(const char *host, u_short port)
}
sock = socket(ai->ai_family, SOCK_STREAM, 0);
if (sock < 0) {
- error("socket: %.100s", strerror(errno));
+ if (ai->ai_next == NULL)
+ error("socket: %.100s", strerror(errno));
+ else
+ verbose("socket: %.100s", strerror(errno));
continue;
}
if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0)