forked from rpms/openssh
24 lines
951 B
Diff
24 lines
951 B
Diff
|
diff -U0 openssh-6.2p2/ChangeLog.ssh_gai_strerror openssh-6.2p2/ChangeLog
|
||
|
|
--- openssh-6.2p2/ChangeLog.ssh_gai_strerror 2013-07-23 12:03:41.467902339 +0200
|
||
|
|
+++ openssh-6.2p2/ChangeLog 2013-07-23 12:06:03.414281151 +0200
|
||
|
|
@@ -0,0 +1,7 @@
|
||
|
|
+20130718
|
||
|
|
+ - 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
|
||
|
|
+
|
||
|
|
diff -up openssh-6.2p2/misc.c.ssh_gai_strerror openssh-6.2p2/misc.c
|
||
|
|
--- openssh-6.2p2/misc.c.ssh_gai_strerror 2013-07-23 12:03:41.321902978 +0200
|
||
|
|
+++ openssh-6.2p2/misc.c 2013-07-23 12:03:41.467902339 +0200
|
||
|
|
@@ -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);
|
||
|
|
}
|