diff options
author | Damien Miller <djm@mindrot.org> | 2013-07-18 16:13:19 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-07-18 16:13:19 +1000 |
commit | 7313fc9222785d0c54a7ffcaf2067f4db02c8d72 (patch) | |
tree | f05395ab7973726c28116045832e4c80e16353be | |
parent | 746d1a6c524d2e90ebe98cc29e42573a3e1c3c1b (diff) | |
download | openssh-git-7313fc9222785d0c54a7ffcaf2067f4db02c8d72.tar.gz |
- djm@cvs.openbsd.org 2013/07/12 00:43:50
[misc.c]
in ssh_gai_strerror() don't fallback to strerror for EAI_SYSTEM when
errno == 0. Avoids confusing error message in some broken resolver
cases. bz#2122 patch from plautrba AT redhat.com; ok dtucker
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | misc.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -44,6 +44,11 @@ - djm@cvs.openbsd.org 2013/07/12 00:20:00 [sftp.c ssh-keygen.c ssh-pkcs11.c] fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@ + - djm@cvs.openbsd.org 2013/07/12 00:43:50 + [misc.c] + in ssh_gai_strerror() don't fallback to strerror for EAI_SYSTEM when + errno == 0. Avoids confusing error message in some broken resolver + cases. bz#2122 patch from plautrba AT redhat.com; ok dtucker 20130702 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.90 2013/06/01 13:15:52 dtucker Exp $ */ +/* $OpenBSD: misc.c,v 1.91 2013/07/12 00:43:50 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -127,7 +127,7 @@ unset_nonblock(int fd) const char * ssh_gai_strerror(int gaierr) { - if (gaierr == EAI_SYSTEM) + if (gaierr == EAI_SYSTEM && errno != 0) return strerror(errno); return gai_strerror(gaierr); } |