diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2010-05-31 16:32:54 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-06-02 23:12:04 +0200 |
| commit | 125b1a8619eb27556e093fd9c9adf451e896f012 (patch) | |
| tree | 8db450d6c98198ede184daa0fbb97fbc79fa0f1b /ares_init.c | |
| parent | 0e8dc6f18eeb8a54115af2b2bd5693f933b6c27f (diff) | |
| download | c-ares-125b1a8619eb27556e093fd9c9adf451e896f012.tar.gz c-ares-125b1a8619eb27556e093fd9c9adf451e896f012.tar.bz2 c-ares-125b1a8619eb27556e093fd9c9adf451e896f012.zip | |
ares_init: Last, not first instance of domain or search should win
Diffstat (limited to 'ares_init.c')
| -rw-r--r-- | ares_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ares_init.c b/ares_init.c index 1f561aa..9d1e447 100644 --- a/ares_init.c +++ b/ares_init.c @@ -839,11 +839,11 @@ DhcpNameServer if (fp) { while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS) { - if ((p = try_config(line, "domain")) && channel->ndomains == -1) + if ((p = try_config(line, "domain"))) status = config_domain(channel, p); else if ((p = try_config(line, "lookup")) && !channel->lookups) status = config_lookup(channel, p, "bind", "file"); - else if ((p = try_config(line, "search")) && channel->ndomains == -1) + else if ((p = try_config(line, "search"))) status = set_search(channel, p); else if ((p = try_config(line, "nameserver")) && channel->nservers == -1) status = config_nameserver(&servers, &nservers, p); |