r4820 - in glibc-package/trunk/debian: . patches/any
Author: aurel32
Date: 2011-07-25 21:55:29 +0000 (Mon, 25 Jul 2011)
New Revision: 4820
Added:
glibc-package/trunk/debian/patches/any/submitted-resolv-ipv6-rotate.diff
Modified:
glibc-package/trunk/debian/changelog
Log:
* Add patches/any/submitted-resolv-ipv6-rotate.diff to fix the rotate option
with IPv6 nameservers. Closes: #627531.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-25 21:53:47 UTC (rev 4819)
+++ glibc-package/trunk/debian/changelog 2011-07-25 21:55:29 UTC (rev 4820)
@@ -17,8 +17,10 @@
patches/any/submitted-resolv-assert.diff to fix assertion triggered by the
previous patch. Closes: #535504, #602291.
* Add support for s390x.
- * Fix debhelper.in/libc.NEWS with the right option to pass to gcc. Closes:
+ * Fix debhelper.in/libc.NEWS with the right option to pass to gcc. Closes:
#629819.
+ * Add patches/any/submitted-resolv-ipv6-rotate.diff to fix the rotate option
+ with IPv6 nameservers. Closes: #627531.
[ Jeremie Koenig ]
* Add debian/libc0.3.symbols.hurd-i386.
Added: glibc-package/trunk/debian/patches/any/submitted-resolv-ipv6-rotate.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-resolv-ipv6-rotate.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-resolv-ipv6-rotate.diff 2011-07-25 21:55:29 UTC (rev 4820)
@@ -0,0 +1,21 @@
+2011-07-25 Aurelien Jarno <aurelien@aurel32.net>
+
+ * res_send.c(__libc_res_nsend): Don't initialize maps for IPv6
+ nameservers.
+
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+index a001c1e..43ff082 100644
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -422,9 +422,9 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ }
+ }
+ n = statp->nscount;
+- if (statp->nscount > EXT(statp).nscount)
++ if (statp->nscount > EXT(statp).nscount + EXT(statp).nscount6)
+ for (n = EXT(statp).nscount, ns = 0;
+- n < statp->nscount; n++) {
++ n < statp->nscount - EXT(statp).nscount6; n++) {
+ while (ns < MAXNS
+ && EXT(statp).nsmap[ns] != MAXNS)
+ ns++;
Reply to: