3 files changed, 5 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index 90aa89dc1..809778802 100644
--- a/CREDITS
+++ b/CREDITS
@@ -53,6 +53,7 @@ Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes
 Larry Jones <larry.jones@sdrc.com> - Bugfixes
 Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes
 Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches
+Martin Johansson <fatbob@acc.umu.se> - Linux fixes
 Mark Miller <markm@swoon.net> - Bugfixes
 Matt Richards <v2matt@btv.ibm.com> - AIX patches
 Michael Stone <mstone@cs.loyola.edu> - Irix enhancements
@@ -81,4 +82,4 @@ Zack Weinberg <zack@wolery.cumb.org> - GNOME askpass enhancement
 
 Apologies to anyone I have missed.
 
-Damien Miller <djm@ibs.com.au>
+Damien Miller <djm@mindrot.org>
diff --git a/ChangeLog b/ChangeLog
index a316b1e9c..86e7cea96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20001014
  - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth
  - (djm) Revert SSH2 serverloop hack, will find a better way.
+ - (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch
+   from Martin Johansson <fatbob@acc.umu.se>
 
 20001007
  - (stevesk) Print PAM return value in PAM log messages to aid
diff --git a/channels.c b/channels.c
index c842aa231..96d8dc4b4 100644
--- a/channels.c
+++ b/channels.c
@@ -1759,7 +1759,7 @@ x11_create_display_inet(int screen_number, int x11_display_offset)
                                 continue;
                         sock = socket(ai->ai_family, SOCK_STREAM, 0);
                         if (sock < 0) {
-                                if (errno != EINVAL) {
+                                if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) {
                                         error("socket: %.100s", strerror(errno));
                                         return NULL;
                                 } else {