summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-26 11:09:44 +1100
committerDamien Miller <djm@mindrot.org>2010-03-26 11:09:44 +1100
commit6480c63b759eb8add9387220fd8ed630e0563316 (patch)
tree13ff0a11016025aa31ca30fd0fe33260fdffeeaa
parent8b90642fcf979737dc2f3152660b0561ec5b3a5d (diff)
- (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721
ok dtucker@
-rw-r--r--ChangeLog2
-rw-r--r--channels.c6
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 @@
11 - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms - 11 - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms -
12 set up SELinux execution context before chroot() call. From Russell 12 set up SELinux execution context before chroot() call. From Russell
13 Coker via Colin watson; bz#1726 ok dtucker@ 13 Coker via Colin watson; bz#1726 ok dtucker@
14 - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721
15 ok dtucker@
14 16
1520100324 1720100324
16 - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory 18 - (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,
3252 sock = socket(ai->ai_family, ai->ai_socktype, 3252 sock = socket(ai->ai_family, ai->ai_socktype,
3253 ai->ai_protocol); 3253 ai->ai_protocol);
3254 if (sock < 0) { 3254 if (sock < 0) {
3255 if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { 3255 if ((errno != EINVAL) && (errno != EAFNOSUPPORT)
3256#ifdef EPFNOSUPPORT
3257 && (errno != EPFNOSUPPORT)
3258#endif
3259 ) {
3256 error("socket: %.100s", strerror(errno)); 3260 error("socket: %.100s", strerror(errno));
3257 freeaddrinfo(aitop); 3261 freeaddrinfo(aitop);
3258 return -1; 3262 return -1;