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 /misc.c | |
parent | 746d1a6c524d2e90ebe98cc29e42573a3e1c3c1b (diff) |
- 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
Diffstat (limited to 'misc.c')
-rw-r--r-- | misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.90 2013/06/01 13:15:52 dtucker Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.91 2013/07/12 00:43:50 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. |
@@ -127,7 +127,7 @@ unset_nonblock(int fd) | |||
127 | const char * | 127 | const char * |
128 | ssh_gai_strerror(int gaierr) | 128 | ssh_gai_strerror(int gaierr) |
129 | { | 129 | { |
130 | if (gaierr == EAI_SYSTEM) | 130 | if (gaierr == EAI_SYSTEM && errno != 0) |
131 | return strerror(errno); | 131 | return strerror(errno); |
132 | return gai_strerror(gaierr); | 132 | return gai_strerror(gaierr); |
133 | } | 133 | } |