generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c71483c0: Merge "When comparing DNS server configs, also compare number of servers"

Browse Source 
* commit 'c71483c0b38a6b4f2675f0bffa221dcf175c34ac':
  When comparing DNS server configs, also compare number of servers
This commit is contained in:
Lorenzo Colitti 2014-09-09 10:42:23 +00:00 committed by Android Git Automerger
commit da0ed4cbfa
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libc/dns/resolv/res_cache.c
View File

@ -1999,10 +1999,25 @@ _resolv_is_nameservers_equal_locked(struct resolv_cache_info* cache_info,
{ {
int i; int i;
char** ns; char** ns;
int currentservers;
int equal = 1; int equal = 1;
// compare each name server against current name servers
if (numservers > MAXNS) numservers = MAXNS; if (numservers > MAXNS) numservers = MAXNS;
// Find out how many nameservers we had before.
currentservers = 0;
for (ns = cache_info->nameservers; *ns; ns++)
currentservers++;
if (currentservers != numservers)
return 0;
// Compare each name server against current name servers.
// TODO: this is incorrect if the list of current or previous nameservers
// contains duplicates. This does not really matter because the framework
// filters out duplicates, but we should probably fix it. It's also
// insensitive to the order of the nameservers; we should probably fix that
// too.
for (i = 0; i < numservers && equal; i++) { for (i = 0; i < numservers && equal; i++) {
ns = cache_info->nameservers; ns = cache_info->nameservers;
equal = 0; equal = 0;