diff options
author | Damien Miller <djm@mindrot.org> | 2008-06-12 06:05:12 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-06-12 06:05:12 +1000 |
commit | 4401e45be6a89f8b2b9f9ba96137107bce39943d (patch) | |
tree | af7ce24d6a685c84e27248380db6c4056f5b2fe4 | |
parent | b8e0500351f42c79d7c75df5637bd9eb01811ff6 (diff) |
- (djm) [channels.c configure.ac]
Do not set SO_REUSEADDR on wildcard X11 listeners (X11UseLocalhost=no)
bz#1464; ok dtucker
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | channels.c | 12 | ||||
-rw-r--r-- | configure.ac | 5 |
3 files changed, 10 insertions, 14 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20080611 | ||
2 | - (djm) [channels.c configure.ac] | ||
3 | Do not set SO_REUSEADDR on wildcard X11 listeners (X11UseLocalhost=no) | ||
4 | bz#1464; ok dtucker | ||
5 | |||
1 | 20080610 | 6 | 20080610 |
2 | - (dtucker) OpenBSD CVS Sync | 7 | - (dtucker) OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2008/06/10 03:57:27 | 8 | - djm@cvs.openbsd.org 2008/06/10 03:57:27 |
@@ -4154,4 +4159,4 @@ | |||
4154 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4159 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4155 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4160 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4156 | 4161 | ||
4157 | $Id: ChangeLog,v 1.4966 2008/06/10 23:47:59 dtucker Exp $ | 4162 | $Id: ChangeLog,v 1.4967 2008/06/11 20:05:12 djm Exp $ |
diff --git a/channels.c b/channels.c index 6808d3a05..233c2247b 100644 --- a/channels.c +++ b/channels.c | |||
@@ -3018,7 +3018,8 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, | |||
3018 | error("setsockopt IPV6_V6ONLY: %.100s", strerror(errno)); | 3018 | error("setsockopt IPV6_V6ONLY: %.100s", strerror(errno)); |
3019 | } | 3019 | } |
3020 | #endif | 3020 | #endif |
3021 | channel_set_reuseaddr(sock); | 3021 | if (x11_use_localhost) |
3022 | channel_set_reuseaddr(sock); | ||
3022 | if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { | 3023 | if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { |
3023 | debug2("bind port %d: %.100s", port, strerror(errno)); | 3024 | debug2("bind port %d: %.100s", port, strerror(errno)); |
3024 | close(sock); | 3025 | close(sock); |
@@ -3030,17 +3031,8 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, | |||
3030 | break; | 3031 | break; |
3031 | } | 3032 | } |
3032 | socks[num_socks++] = sock; | 3033 | socks[num_socks++] = sock; |
3033 | #ifndef DONT_TRY_OTHER_AF | ||
3034 | if (num_socks == NUM_SOCKS) | 3034 | if (num_socks == NUM_SOCKS) |
3035 | break; | 3035 | break; |
3036 | #else | ||
3037 | if (x11_use_localhost) { | ||
3038 | if (num_socks == NUM_SOCKS) | ||
3039 | break; | ||
3040 | } else { | ||
3041 | break; | ||
3042 | } | ||
3043 | #endif | ||
3044 | } | 3036 | } |
3045 | freeaddrinfo(aitop); | 3037 | freeaddrinfo(aitop); |
3046 | if (num_socks > 0) | 3038 | if (num_socks > 0) |
diff --git a/configure.ac b/configure.ac index 130ef6bc0..7ad732657 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.403 2008/06/10 18:15:05 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.404 2008/06/11 20:05:12 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.403 $) | 18 | AC_REVISION($Revision: 1.404 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -553,7 +553,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
553 | no_dev_ptmx=1 | 553 | no_dev_ptmx=1 |
554 | check_for_libcrypt_later=1 | 554 | check_for_libcrypt_later=1 |
555 | check_for_openpty_ctty_bug=1 | 555 | check_for_openpty_ctty_bug=1 |
556 | AC_DEFINE(DONT_TRY_OTHER_AF, 1, [Workaround more Linux IPv6 quirks]) | ||
557 | AC_DEFINE(PAM_TTY_KLUDGE, 1, | 556 | AC_DEFINE(PAM_TTY_KLUDGE, 1, |
558 | [Work around problematic Linux PAM modules handling of PAM_TTY]) | 557 | [Work around problematic Linux PAM modules handling of PAM_TTY]) |
559 | AC_DEFINE(LOCKED_PASSWD_PREFIX, "!", | 558 | AC_DEFINE(LOCKED_PASSWD_PREFIX, "!", |