r4822 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2011-07-25 23:33:23 +0000 (Mon, 25 Jul 2011)
New Revision: 4822
Added:
glibc-package/trunk/debian/patches/any/submitted-resolv-init.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add any/submitted-resolv-init.diff to fix issue with the resolver when
RES_ROTATE is enabled. Closes: #593571.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-25 23:05:36 UTC (rev 4821)
+++ glibc-package/trunk/debian/changelog 2011-07-25 23:33:23 UTC (rev 4822)
@@ -19,6 +19,8 @@
* Add support for s390x.
* Fix debhelper.in/libc.NEWS with the right option to pass to gcc. Closes:
#629819.
+ * Add any/submitted-resolv-init.diff to fix issue with the resolver when
+ RES_ROTATE is enabled. Closes: #593571.
[ Jeremie Koenig ]
* Add debian/libc0.3.symbols.hurd-i386.
Added: glibc-package/trunk/debian/patches/any/submitted-resolv-init.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-resolv-init.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-resolv-init.diff 2011-07-25 23:33:23 UTC (rev 4822)
@@ -0,0 +1,18 @@
+2011-07-26 Aurelien Jarno <aurelien@aurel32.net>
+
+ * res_send.c(__libc_res_nsend): Correctly copy the nameserver
+ address.
+
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+index a001c1e..51ddf38 100644
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -441,7 +441,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ malloc(sizeof (struct sockaddr_in6));
+ if (EXT(statp).nsaddrs[n] != NULL) {
+ memset (mempcpy(EXT(statp).nsaddrs[n],
+- &statp->nsaddr_list[n],
++ &statp->nsaddr_list[ns],
+ sizeof (struct sockaddr_in)),
+ '\0',
+ sizeof (struct sockaddr_in6)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-07-25 23:05:36 UTC (rev 4821)
+++ glibc-package/trunk/debian/patches/series 2011-07-25 23:33:23 UTC (rev 4822)
@@ -274,3 +274,4 @@
any/submitted-resolv-assert.diff
any/cvs-fnmatch.diff
any/cvs-ifunc.diff
+any/submitted-resolv-init.diff
Reply to: