am cd1480a6: am 26ac8032: Merge "Change how DNS resolver handle no default iface" into klp-dev

* commit 'cd1480a6622de1043645093b29beee43e0671048':
  Change how DNS resolver handle no default iface
This commit is contained in:
Robert Greenwalt 2013-08-26 15:17:05 -07:00 committed by Android Git Automerger
commit 76d93d6002

View File

@ -2531,14 +2531,15 @@ _resolv_set_iface_for_uid_range(const char* ifname, int uid_start, int uid_end)
uidiface_info->next = _res_uidiface_list.next; uidiface_info->next = _res_uidiface_list.next;
_res_uidiface_list.next = uidiface_info; _res_uidiface_list.next = uidiface_info;
XLOG("_resolv_set_iface_for_uid_range: [%d,%d], iface %s\n", low, high, ifname); XLOG("_resolv_set_iface_for_uid_range: [%d,%d], iface %s\n", uid_start, uid_end,
ifname);
} else { } else {
XLOG("_resolv_set_iface_for_uid_range failing calloc\n"); XLOG("_resolv_set_iface_for_uid_range failing calloc\n");
rv = -1; rv = -1;
errno = EINVAL; errno = EINVAL;
} }
} else { } else {
XLOG("_resolv_set_iface_for_uid_range range [%d,%d] overlaps\n", low, high); XLOG("_resolv_set_iface_for_uid_range range [%d,%d] overlaps\n", uid_start, uid_end);
rv = -1; rv = -1;
errno = EINVAL; errno = EINVAL;
} }