diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-12-07 17:24:49 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-12-07 17:24:49 +0000 |
commit | e181a4d2949d063a9417cf2691cb0ec2d3568e53 (patch) | |
tree | 1dd8fb0cb1305a95c17a6778386fffba7bee358c | |
parent | c97b1affc53cbe2c9a0777b7c9b9d400b09b2f89 (diff) |
- stevesk@cvs.openbsd.org 2001/12/06 18:02:32
[channels.c sshconnect.c]
shutdown(sock, SHUT_RDWR) not needed here; ok markus@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | channels.c | 5 | ||||
-rw-r--r-- | sshconnect.c | 3 |
3 files changed, 7 insertions, 7 deletions
@@ -1,6 +1,10 @@ 20011207 - (bal) PCRE no longer required. Banished from the source along with fake-regex.h + - (bal) OpenBSD CVS Sync + - stevesk@cvs.openbsd.org 2001/12/06 18:02:32 + [channels.c sshconnect.c] + shutdown(sock, SHUT_RDWR) not needed here; ok markus@ 20011206 - (bal) OpenBSD CVS Sync @@ -6998,4 +7002,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1688 2001/12/07 17:20:47 mouring Exp $ +$Id: ChangeLog,v 1.1689 2001/12/07 17:24:49 mouring Exp $ @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.143 2001/12/05 10:06:12 deraadt Exp $"); +RCSID("$OpenBSD: channels.c,v 1.144 2001/12/06 18:02:32 stevesk Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2439,14 +2439,12 @@ x11_create_display_inet(int screen_number, int x11_display_offset) } if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { debug("bind port %d: %.100s", port, strerror(errno)); - shutdown(sock, SHUT_RDWR); close(sock); if (ai->ai_next) continue; for (n = 0; n < num_socks; n++) { - shutdown(socks[n], SHUT_RDWR); close(socks[n]); } num_socks = 0; @@ -2473,7 +2471,6 @@ x11_create_display_inet(int screen_number, int x11_display_offset) sock = socks[n]; if (listen(sock, 5) < 0) { error("listen: %.100s", strerror(errno)); - shutdown(sock, SHUT_RDWR); close(sock); return NULL; } diff --git a/sshconnect.c b/sshconnect.c index 31cd238e..64eb8d5f 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.116 2001/12/05 10:06:13 deraadt Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.117 2001/12/06 18:02:32 stevesk Exp $"); #include <openssl/bn.h> @@ -340,7 +340,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, * which connect() has already returned an * error. */ - shutdown(sock, SHUT_RDWR); close(sock); } } |