about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-03-28 13:06:05 -0400
committerUlrich Drepper <drepper@gmail.com>2012-03-28 13:06:05 -0400
commitfb289bde9a171c5f7fbcd1230018562dc0bd8ded (patch)
tree1241c18540bd856de5a57808329b64e03d490f7c /ChangeLog
parent05f3d1f6c6ae403180259b84a5af0061a62ffb98 (diff)
parent86ae07a8c9e8e26806f7b8dedf57e7b14a308c69 (diff)
downloadglibc-fb289bde9a171c5f7fbcd1230018562dc0bd8ded.tar.gz
glibc-fb289bde9a171c5f7fbcd1230018562dc0bd8ded.tar.xz
glibc-fb289bde9a171c5f7fbcd1230018562dc0bd8ded.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 94d51265e9..03b77954b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 
 	* malloc/mallocbug.c: Avoid warnings about unused variables.
 
+2012-02-22  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	[BZ #13760]
+	* resolv/nss_dns/dns-host.c (gaih_getanswer): Look for errno
+	in the right place. Discard and retry query if response is
+	larger than input buffer size.
+
 2012-03-28  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #369]