diff options
-rw-r--r-- | channels.c | 3 | ||||
-rw-r--r-- | debian/changelog | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/channels.c b/channels.c index 255280e0b..900ab848f 100644 --- a/channels.c +++ b/channels.c | |||
@@ -2909,9 +2909,6 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, | |||
2909 | debug2("bind port %d: %.100s", port, strerror(errno)); | 2909 | debug2("bind port %d: %.100s", port, strerror(errno)); |
2910 | close(sock); | 2910 | close(sock); |
2911 | 2911 | ||
2912 | if (ai->ai_next) | ||
2913 | continue; | ||
2914 | |||
2915 | for (n = 0; n < num_socks; n++) { | 2912 | for (n = 0; n < num_socks; n++) { |
2916 | close(socks[n]); | 2913 | close(socks[n]); |
2917 | } | 2914 | } |
diff --git a/debian/changelog b/debian/changelog index 0d4707455..841ac9edd 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -3,6 +3,9 @@ openssh (1:4.7p1-5) UNRELEASED; urgency=low | |||
3 | * Recommends: xauth rather than Suggests: xbase-clients. | 3 | * Recommends: xauth rather than Suggests: xbase-clients. |
4 | * Document in ssh(1) that '-S none' disables connection sharing | 4 | * Document in ssh(1) that '-S none' disables connection sharing |
5 | (closes: #471437). | 5 | (closes: #471437). |
6 | * Patch from Red Hat / Fedora: | ||
7 | - Don't use X11 forwarding port which can't be bound on all address | ||
8 | families (closes: #463011). | ||
6 | * debconf template translations: | 9 | * debconf template translations: |
7 | - Update Finnish (thanks, Esko Arajärvi; closes: #468563). | 10 | - Update Finnish (thanks, Esko Arajärvi; closes: #468563). |
8 | 11 | ||