am e6345f1a: Merge "Tell the dns resolver about our domains."

* commit 'e6345f1a1ec691690c69d5663ca8bb2b70240d93':
  Tell the dns resolver about our domains.
This commit is contained in:
Robert Greenwalt 2013-07-31 17:57:45 -07:00 committed by Android Git Automerger
commit 7e5d7485b7

View File

@ -2313,6 +2313,12 @@ res_searchN(const char *name, struct res_target *target, res_state res)
(dots && !trailing_dot && (res->options & RES_DNSRCH))) {
int done = 0;
/* Unfortunately we need to set stuff up before
* the domain stuff is tried. Will have a better
* fix after thread pools are used.
*/
_resolv_populate_res_for_iface(res);
for (domain = (const char * const *)res->dnsrch;
*domain && !done;
domain++) {