diff options
-rw-r--r-- | CREDITS | 3 | ||||
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | channels.c | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -53,6 +53,7 @@ Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes | |||
53 | Larry Jones <larry.jones@sdrc.com> - Bugfixes | 53 | Larry Jones <larry.jones@sdrc.com> - Bugfixes |
54 | Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes | 54 | Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes |
55 | Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches | 55 | Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches |
56 | Martin Johansson <fatbob@acc.umu.se> - Linux fixes | ||
56 | Mark Miller <markm@swoon.net> - Bugfixes | 57 | Mark Miller <markm@swoon.net> - Bugfixes |
57 | Matt Richards <v2matt@btv.ibm.com> - AIX patches | 58 | Matt Richards <v2matt@btv.ibm.com> - AIX patches |
58 | Michael Stone <mstone@cs.loyola.edu> - Irix enhancements | 59 | Michael Stone <mstone@cs.loyola.edu> - Irix enhancements |
@@ -81,4 +82,4 @@ Zack Weinberg <zack@wolery.cumb.org> - GNOME askpass enhancement | |||
81 | 82 | ||
82 | Apologies to anyone I have missed. | 83 | Apologies to anyone I have missed. |
83 | 84 | ||
84 | Damien Miller <djm@ibs.com.au> | 85 | Damien Miller <djm@mindrot.org> |
@@ -1,6 +1,8 @@ | |||
1 | 20001014 | 1 | 20001014 |
2 | - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth | 2 | - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth |
3 | - (djm) Revert SSH2 serverloop hack, will find a better way. | 3 | - (djm) Revert SSH2 serverloop hack, will find a better way. |
4 | - (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch | ||
5 | from Martin Johansson <fatbob@acc.umu.se> | ||
4 | 6 | ||
5 | 20001007 | 7 | 20001007 |
6 | - (stevesk) Print PAM return value in PAM log messages to aid | 8 | - (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) | |||
1759 | continue; | 1759 | continue; |
1760 | sock = socket(ai->ai_family, SOCK_STREAM, 0); | 1760 | sock = socket(ai->ai_family, SOCK_STREAM, 0); |
1761 | if (sock < 0) { | 1761 | if (sock < 0) { |
1762 | if (errno != EINVAL) { | 1762 | if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { |
1763 | error("socket: %.100s", strerror(errno)); | 1763 | error("socket: %.100s", strerror(errno)); |
1764 | return NULL; | 1764 | return NULL; |
1765 | } else { | 1765 | } else { |