aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteinar H. Gunderson <sesse@google.com>2007-11-15 09:16:48 +0000
committerSteinar H. Gunderson <sesse@google.com>2007-11-15 09:16:48 +0000
commit5cf6a539feb3332471de60929edce3e7014521ac (patch)
tree819d75fbf82d26ba47faaac8f1ed5d7f379abb35
parent17fde12fb853c59a026fb5de50d6472af682a956 (diff)
When looking up in DNS and then in the hosts file, return the error code from DNS if both fail, instead of returning the error code from the hosts file, as today. Patch from the Google tree.
-rw-r--r--ares/ares_gethostbyname.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index b96ac6bf7..8610cba63 100644
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -57,7 +57,7 @@ struct host_query {
int timeouts;
};
-static void next_lookup(struct host_query *hquery, int status);
+static void next_lookup(struct host_query *hquery, int status_code);
static void host_callback(void *arg, int status, int timeouts,
unsigned char *abuf, int alen);
static void end_hquery(struct host_query *hquery, int status,
@@ -111,13 +111,14 @@ void ares_gethostbyname(ares_channel channel, const char *name, int family,
hquery->timeouts = 0;
/* Start performing lookups according to channel->lookups. */
- next_lookup(hquery, ARES_SUCCESS);
+ next_lookup(hquery, ARES_ECONNREFUSED /* initial error code */);
}
-static void next_lookup(struct host_query *hquery, int status)
+static void next_lookup(struct host_query *hquery, int status_code)
{
const char *p;
struct hostent *host;
+ int status = status_code;
for (p = hquery->remaining_lookups; *p; p++)
{
@@ -142,6 +143,7 @@ static void next_lookup(struct host_query *hquery, int status)
end_hquery(hquery, status, host);
return;
}
+ status = status_code; /* Use original status code */
break;
}
}