From: djm <djm>
Date: Fri, 10 Jan 2003 10:45:12 +0000 (+0000)
Subject:    - djm@cvs.openbsd.org 2003/01/10 10:32:54
X-Git-Tag: V_3_6_P1~86
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/4940c411b5f51cd884db52d81f46ad4c99c13e7c

   - djm@cvs.openbsd.org 2003/01/10 10:32:54
     [channels.c]
     hush socket() errors, except last. Fixes mindrot bug #408; ok markus@
---

diff --git a/ChangeLog b/ChangeLog
index ecee9fd9..92640944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
      Don't ftruncate after write error, creating sparse files of 
      incorrect length
      mindrot bug #403, reported by rusr@cup.hp.com; ok markus@
+   - djm@cvs.openbsd.org 2003/01/10 10:32:54
+     [channels.c]
+     hush socket() errors, except last. Fixes mindrot bug #408; ok markus@
 
 20030108
  - (djm) Sync openbsd-compat/ with OpenBSD -current
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)