vishalmishra434 / rpms / openssh

Forked from rpms/openssh 3 months ago
Clone
Petr Lautrbach 17df27
diff -U0 openssh-6.2p2/ChangeLog.ssh_gai_strerror openssh-6.2p2/ChangeLog
Petr Lautrbach 17df27
--- openssh-6.2p2/ChangeLog.ssh_gai_strerror	2013-07-23 12:03:41.467902339 +0200
Petr Lautrbach 17df27
+++ openssh-6.2p2/ChangeLog	2013-07-23 12:06:03.414281151 +0200
Petr Lautrbach 17df27
@@ -0,0 +1,7 @@
Petr Lautrbach 17df27
+20130718
Petr Lautrbach 17df27
+   - djm@cvs.openbsd.org 2013/07/12 00:43:50
Petr Lautrbach 17df27
+     [misc.c]
Petr Lautrbach 17df27
+     in ssh_gai_strerror() don't fallback to strerror for EAI_SYSTEM when
Petr Lautrbach 17df27
+     errno == 0. Avoids confusing error message in some broken resolver
Petr Lautrbach 17df27
+     cases. bz#2122 patch from plautrba AT redhat.com; ok dtucker
Petr Lautrbach 17df27
+
Petr Lautrbach 17df27
diff -up openssh-6.2p2/misc.c.ssh_gai_strerror openssh-6.2p2/misc.c
Petr Lautrbach 17df27
--- openssh-6.2p2/misc.c.ssh_gai_strerror	2013-07-23 12:03:41.321902978 +0200
Petr Lautrbach 17df27
+++ openssh-6.2p2/misc.c	2013-07-23 12:03:41.467902339 +0200
Petr Lautrbach 17df27
@@ -127,7 +127,7 @@ unset_nonblock(int fd)
Petr Lautrbach 17df27
 const char *
Petr Lautrbach 17df27
 ssh_gai_strerror(int gaierr)
Petr Lautrbach 17df27
 {
Petr Lautrbach 17df27
-	if (gaierr == EAI_SYSTEM)
Petr Lautrbach 17df27
+	if (gaierr == EAI_SYSTEM && errno != 0)
Petr Lautrbach 17df27
 		return strerror(errno);
Petr Lautrbach 17df27
 	return gai_strerror(gaierr);
Petr Lautrbach 17df27
 }