From 64f398dca52df6313169f33cfc20a69d51c3bc2b Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 27 Mar 2012 18:00:18 -0400 Subject: Return correct resolv_status on resolver timeout https://fedorahosted.org/sssd/ticket/1274 --- src/resolv/async_resolv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/resolv/async_resolv.c') diff --git a/src/resolv/async_resolv.c b/src/resolv/async_resolv.c index 1fbd671a9..ff19050b0 100644 --- a/src/resolv/async_resolv.c +++ b/src/resolv/async_resolv.c @@ -511,7 +511,9 @@ resolv_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct resolv_ctx *ctx; if (timeout < 1) { - return EINVAL; + DEBUG(SSSDBG_MINOR_FAILURE, + ("The timeout is too short, DNS operations are going to fail. " + "This is a bug outside unit tests\n")); } ctx = talloc_zero(mem_ctx, struct resolv_ctx); @@ -1389,6 +1391,9 @@ resolv_gethostbyname_done(struct tevent_req *subreq) /* No more databases and/or address families */ tevent_req_error(req, ENOENT); return; + } else if (ret == ETIMEDOUT) { + /* In case we killed the request before c-ares answered */ + state->status = ARES_ETIMEOUT; } if (ret != EOK) { -- cgit