diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-12-06 18:02:33 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-12-06 18:02:33 +0000 |
| commit | 66dc933a5f77daef1c9461096eae0357cc77677b (patch) | |
| tree | a90515b69a9f2deac167e5447748a3f2ec68ed35 | |
| parent | 6e977f0a5221e329a7644b97848d927336997a6a (diff) | |
shutdown(sock, SHUT_RDWR) not needed here; ok markus@
| -rw-r--r-- | usr.bin/ssh/channels.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index bf86e65695b..ca840743c9c 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -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" @@ -2425,10 +2425,8 @@ x11_create_display_inet(int x11_display_offset, int gateway_ports) } if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { debug("bind port %d: %.100s", port, strerror(errno)); - shutdown(sock, SHUT_RDWR); close(sock); for (n = 0; n < num_socks; n++) { - shutdown(socks[n], SHUT_RDWR); close(socks[n]); } num_socks = 0; @@ -2451,7 +2449,6 @@ x11_create_display_inet(int x11_display_offset, int gateway_ports) sock = socks[n]; if (listen(sock, 5) < 0) { error("listen: %.100s", strerror(errno)); - shutdown(sock, SHUT_RDWR); close(sock); return -1; } diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 470bcb557c9..bf217dd92aa 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/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> @@ -332,7 +332,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, * which connect() has already returned an * error. */ - shutdown(sock, SHUT_RDWR); close(sock); } } |