diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-09-17 07:47:03 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-09-17 07:47:03 +0000 |
| commit | 69adeccfce42ef399bcf101bfd2074f10acd43a6 (patch) | |
| tree | 95325a5c52bf5cfdfb5bce72a2728ac7573539c0 /usr.bin | |
| parent | 960d24bdc0d89b741f1fb1e5ae30a3ea9f5bcb12 (diff) | |
don't quit while creating X11 listening socket.
http://mail-index.netbsd.org/current-users/2002/09/16/0005.html
got from portable. markus ok
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/channels.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 0b0a87587f6..17b773b7b27 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.182 2002/09/13 19:23:09 stevesk Exp $"); +RCSID("$OpenBSD: channels.c,v 1.183 2002/09/17 07:47:02 itojun Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2373,6 +2373,10 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { debug("bind port %d: %.100s", port, strerror(errno)); close(sock); + + if (ai->ai_next) + continue; + for (n = 0; n < num_socks; n++) { close(socks[n]); } |