diff options
| author |   djm <djm@openbsd.org> | 2013-07-12 00:43:50 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2013-07-12 00:43:50 +0000 |
| commit | ff8317a1eb76bf628c0eaeaca56d5c5da66b12e6 (patch) | |
| tree | 1e06010d3be03a9870a2afb779022c3efe069211 | |
| parent | fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@ (diff) | |
| download | wireguard-openbsd-ff8317a1eb76bf628c0eaeaca56d5c5da66b12e6.tar.xz wireguard-openbsd-ff8317a1eb76bf628c0eaeaca56d5c5da66b12e6.zip | |
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-- | usr.bin/ssh/misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c index 82047f96b14..b3f2590fc27 100644 --- a/usr.bin/ssh/misc.c +++ b/usr.bin/ssh/misc.c @@ -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. @@ -119,7 +119,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); } |