summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ssh/libssh/common/channels.c
diff options
context:
space:
mode:
authorjp161948 <none@none>2008-04-18 02:44:53 -0700
committerjp161948 <none@none>2008-04-18 02:44:53 -0700
commit4c487f6f6aed98d002684b73c715fbc440f5125d (patch)
tree2aef04cc8e5d822f8320f85918f16fe785950ac6 /usr/src/cmd/ssh/libssh/common/channels.c
parentd2570e76b6b60a66e241053a6964b7c5f5b61fc3 (diff)
downloadillumos-gate-4c487f6f6aed98d002684b73c715fbc440f5125d.tar.gz
6684003 fix CVE-2008-1483 in SunSSH
Diffstat (limited to 'usr/src/cmd/ssh/libssh/common/channels.c')
-rw-r--r--usr/src/cmd/ssh/libssh/common/channels.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/channels.c b/usr/src/cmd/ssh/libssh/common/channels.c
index 03720994e3..f502ca7b6a 100644
--- a/usr/src/cmd/ssh/libssh/common/channels.c
+++ b/usr/src/cmd/ssh/libssh/common/channels.c
@@ -38,7 +38,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -2662,12 +2662,10 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
}
#endif
if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
- debug("bind port %d: %.100s", port, strerror(errno));
+ debug("bind port %d: %.100s; skipping this port", port,
+ strerror(errno));
close(sock);
- if (ai->ai_next)
- continue;
-
for (n = 0; n < num_socks; n++) {
close(socks[n]);
}