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,
                                 debug2("bind port %d: %.100s", port, strerror(errno));
                                 close(sock);
 
-                                if (ai->ai_next)
-                                        continue;
-
                                 for (n = 0; n < num_socks; n++) {
                                         close(socks[n]);
                                 }
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
   * Recommends: xauth rather than Suggests: xbase-clients.
   * Document in ssh(1) that '-S none' disables connection sharing
     (closes: #471437).
+  * Patch from Red Hat / Fedora:
+    - Don't use X11 forwarding port which can't be bound on all address
+      families (closes: #463011).
   * debconf template translations:
     - Update Finnish (thanks, Esko Arajärvi; closes: #468563).