]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/glibc/glibc-rh804630.patch
Merge remote-tracking branch 'origin/next' into thirteen
[people/pmueller/ipfire-2.x.git] / src / patches / glibc / glibc-rh804630.patch
1 diff -rup c/resolv/res_send.c d/resolv/res_send.c
2 --- c/resolv/res_send.c 2012-01-01 05:16:32.000000000 -0700
3 +++ d/resolv/res_send.c 2012-03-30 12:39:30.862467628 -0600
4 @@ -409,6 +409,7 @@ __libc_res_nsend(res_state statp, const
5 */
6 if (EXT(statp).nsinit == 0) {
7 unsigned char map[MAXNS];
8 + unsigned int ext_total_nscount;
9
10 memset (map, MAXNS, sizeof (map));
11 for (n = 0; n < MAXNS; n++) {
12 @@ -422,8 +423,9 @@ __libc_res_nsend(res_state statp, const
13 }
14 }
15 n = statp->nscount;
16 - if (statp->nscount > EXT(statp).nscount)
17 - for (n = EXT(statp).nscount, ns = 0;
18 + ext_total_nscount = EXT(statp).nscount + EXT(statp).nscount6;
19 + if (statp->nscount > ext_total_nscount)
20 + for (n = ext_total_nscount, ns = 0;
21 n < statp->nscount; n++) {
22 while (ns < MAXNS
23 && EXT(statp).nsmap[ns] != MAXNS)