2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c569328f5..f217bd831 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
  - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms -
    set up SELinux execution context before chroot() call. From Russell
    Coker via Colin watson; bz#1726 ok dtucker@
+ - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721
+   ok dtucker@
 
 20100324
  - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory
diff --git a/channels.c b/channels.c
index d8c53a4a8..a55d27817 100644
--- a/channels.c
+++ b/channels.c
@@ -3252,7 +3252,11 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                         sock = socket(ai->ai_family, ai->ai_socktype,
                             ai->ai_protocol);
                         if (sock < 0) {
-                                if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) {
+                                if ((errno != EINVAL) && (errno != EAFNOSUPPORT)
+#ifdef EPFNOSUPPORT
+                                    && (errno != EPFNOSUPPORT)
+#endif 
+                                    ) {
                                         error("socket: %.100s", strerror(errno));
                                         freeaddrinfo(aitop);
                                         return -1;