]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/glibc/glibc-rh837026.patch
Merge remote-tracking branch 'origin/next' into thirteen
[people/pmueller/ipfire-2.x.git] / src / patches / glibc / glibc-rh837026.patch
1 diff -rup a/resolv/res_send.c b/resolv/res_send.c
2 --- a/resolv/res_send.c 2012-06-28 11:55:38.361886650 -0600
3 +++ b/resolv/res_send.c 2012-06-28 11:51:38.253963687 -0600
4 @@ -424,17 +424,15 @@ __libc_res_nsend(res_state statp, const
5 }
6 n = statp->nscount;
7 ext_total_nscount = EXT(statp).nscount + EXT(statp).nscount6;
8 - if (statp->nscount > ext_total_nscount)
9 - for (n = ext_total_nscount, ns = 0;
10 - n < statp->nscount; n++) {
11 - while (ns < MAXNS
12 - && EXT(statp).nsmap[ns] != MAXNS)
13 - ns++;
14 - if (ns == MAXNS)
15 - break;
16 - EXT(statp).nsmap[ns] = n;
17 - map[n] = ns++;
18 - }
19 + for (n = 0, ns = 0; n < statp->nscount - ext_total_nscount; n++) {
20 + while (ns < MAXNS
21 + && EXT(statp).nsmap[ns] != MAXNS)
22 + ns++;
23 + if (ns == MAXNS)
24 + break;
25 + EXT(statp).nsmap[ns] = n;
26 + map[n] = ns++;
27 + }
28 EXT(statp).nscount = n;
29 for (ns = 0; ns < EXT(statp).nscount; ns++) {
30 n = map[ns];