diff options
| author | Damien Miller <djm@mindrot.org> | 2000-10-14 03:37:19 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-10-14 03:37:19 +0200 |
| commit | 89d9796fbedef4eed6956a2c095c7cc25330c28d (patch) | |
| tree | cad7c8ba07ce733b41db684fb52444306026ff93 | |
| parent | - (djm) Revert SSH2 serverloop hack, will find a better way. (diff) | |
| download | openssh-89d9796fbedef4eed6956a2c095c7cc25330c28d.tar.xz openssh-89d9796fbedef4eed6956a2c095c7cc25330c28d.zip | |
- (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch
from Martin Johansson <fatbob@acc.umu.se>
| -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 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> @@ -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 { |