summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/channels.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2010-04-28 10:36:33 +0000
committerdes <des@FreeBSD.org>2010-04-28 10:36:33 +0000
commitfc607a2e80dfeb125ae2fe83191d934929997047 (patch)
treebd00e72572bcfba5ac7d243462c79d29a987c5a2 /crypto/openssh/channels.c
parentc86e821ecb2a324088edbbb87198b4d55833575a (diff)
downloadFreeBSD-src-fc607a2e80dfeb125ae2fe83191d934929997047.zip
FreeBSD-src-fc607a2e80dfeb125ae2fe83191d934929997047.tar.gz
Upgrade to OpenSSH 5.5p1.
Diffstat (limited to 'crypto/openssh/channels.c')
-rw-r--r--crypto/openssh/channels.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/openssh/channels.c b/crypto/openssh/channels.c
index d8c53a4..a55d278 100644
--- a/crypto/openssh/channels.c
+++ b/crypto/openssh/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;
OpenPOWER on IntegriCloud