[glibc/f17] Fix regression after patch for BZ804630 (#835090).

[Jeffrey Law]

commit 1910ee7039b6744ba85fe7f91a652d4a86e6984a
Author: Jeff Law <law at redhat.com>
Date:   Mon Jul 2 07:39:17 2012 -0600

    Fix regression after patch for BZ804630 (#835090).

 glibc-rh835090.patch |   30 ++++++++++++++++++++++++++++++
 glibc.spec           |    7 ++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/glibc-rh835090.patch b/glibc-rh835090.patch
new file mode 100644
index 0000000..558ad4f
--- /dev/null
+++ b/glibc-rh835090.patch
@@ -0,0 +1,30 @@
+diff -rup a/resolv/res_send.c b/resolv/res_send.c
+--- a/resolv/res_send.c	2012-06-28 11:55:38.361886650 -0600
++++ b/resolv/res_send.c	2012-06-28 11:51:38.253963687 -0600
+@@ -424,17 +424,15 @@ __libc_res_nsend(res_state statp, const
+ 		}
+ 		n = statp->nscount;
+ 		ext_total_nscount = EXT(statp).nscount + EXT(statp).nscount6;
+-		if (statp->nscount > ext_total_nscount)
+-			for (n = ext_total_nscount, ns = 0;
+-			     n < statp->nscount; n++) {
+-				while (ns < MAXNS
+-				       && EXT(statp).nsmap[ns] != MAXNS)
+-					ns++;
+-				if (ns == MAXNS)
+-					break;
+-				EXT(statp).nsmap[ns] = n;
+-				map[n] = ns++;
+-			}
++		for (n = 0, ns = 0; n < statp->nscount - ext_total_nscount; n++) {
++			while (ns < MAXNS
++			       && EXT(statp).nsmap[ns] != MAXNS)
++				ns++;
++			if (ns == MAXNS)
++				break;
++			EXT(statp).nsmap[ns] = n;
++			map[n] = ns++;
++		}
+ 		EXT(statp).nscount = n;
+ 		for (ns = 0; ns < EXT(statp).nscount; ns++) {
+ 			n = map[ns];
diff --git a/glibc.spec b/glibc.spec
index 4f051fd..1c95ea3 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 49%{?dist}
+Release: 50%{?dist}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -94,6 +94,7 @@ Patch0027: %{name}-rh564528.patch
 # stap and thus will never be accepted upstream
 Patch0044: %{name}-stap-libm.patch
 
+Patch0063: %{name}-rh835090.patch
 #
 # Patches from upstream
 #
@@ -495,6 +496,7 @@ popd
 %patch2060 -p1
 %patch2061 -p1
 %patch2062 -p1
+%patch0063 -p1
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@@ -1361,6 +1363,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Jun 28 2012 Jeff Law <law at redhat.com> - 2.15.50
+  - Fix regression after patch for BZ804630 (#835090).
+
 * Thu Jun 20 2012 Jeff Law <law at redhat.com> - 2.15.49
   - Fix use-after-free in dcigettext.c (#816647).