summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--channels.c5
-rw-r--r--sshconnect.c3
3 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f05268b6c..f589a537f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
120011207 120011207
2 - (bal) PCRE no longer required. Banished from the source along with 2 - (bal) PCRE no longer required. Banished from the source along with
3 fake-regex.h 3 fake-regex.h
4 - (bal) OpenBSD CVS Sync
5 - stevesk@cvs.openbsd.org 2001/12/06 18:02:32
6 [channels.c sshconnect.c]
7 shutdown(sock, SHUT_RDWR) not needed here; ok markus@
4 8
520011206 920011206
6 - (bal) OpenBSD CVS Sync 10 - (bal) OpenBSD CVS Sync
@@ -6998,4 +7002,4 @@
6998 - Wrote replacements for strlcpy and mkdtemp 7002 - Wrote replacements for strlcpy and mkdtemp
6999 - Released 1.0pre1 7003 - Released 1.0pre1
7000 7004
7001$Id: ChangeLog,v 1.1688 2001/12/07 17:20:47 mouring Exp $ 7005$Id: ChangeLog,v 1.1689 2001/12/07 17:24:49 mouring Exp $
diff --git a/channels.c b/channels.c
index 4c14ed491..7cc0d281e 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.143 2001/12/05 10:06:12 deraadt Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.144 2001/12/06 18:02:32 stevesk Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -2439,14 +2439,12 @@ x11_create_display_inet(int screen_number, int x11_display_offset)
2439 } 2439 }
2440 if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { 2440 if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
2441 debug("bind port %d: %.100s", port, strerror(errno)); 2441 debug("bind port %d: %.100s", port, strerror(errno));
2442 shutdown(sock, SHUT_RDWR);
2443 close(sock); 2442 close(sock);
2444 2443
2445 if (ai->ai_next) 2444 if (ai->ai_next)
2446 continue; 2445 continue;
2447 2446
2448 for (n = 0; n < num_socks; n++) { 2447 for (n = 0; n < num_socks; n++) {
2449 shutdown(socks[n], SHUT_RDWR);
2450 close(socks[n]); 2448 close(socks[n]);
2451 } 2449 }
2452 num_socks = 0; 2450 num_socks = 0;
@@ -2473,7 +2471,6 @@ x11_create_display_inet(int screen_number, int x11_display_offset)
2473 sock = socks[n]; 2471 sock = socks[n];
2474 if (listen(sock, 5) < 0) { 2472 if (listen(sock, 5) < 0) {
2475 error("listen: %.100s", strerror(errno)); 2473 error("listen: %.100s", strerror(errno));
2476 shutdown(sock, SHUT_RDWR);
2477 close(sock); 2474 close(sock);
2478 return NULL; 2475 return NULL;
2479 } 2476 }
diff --git a/sshconnect.c b/sshconnect.c
index 31cd238ee..64eb8d5fa 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.116 2001/12/05 10:06:13 deraadt Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.117 2001/12/06 18:02:32 stevesk Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -340,7 +340,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
340 * which connect() has already returned an 340 * which connect() has already returned an
341 * error. 341 * error.
342 */ 342 */
343 shutdown(sock, SHUT_RDWR);
344 close(sock); 343 close(sock);
345 } 344 }
346 } 345 }