diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-03 11:39:39 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-03 16:15:28 +0100 |
| commit | eafbc66c2ff6365478e62a8df3fd005bf80e5c7b (patch) | |
| tree | bd5fc3a9d035a666d61fc170cbe0600975973124 /src | |
| parent | cac22be9e58abdcf6c3bf66190fba0f7cb6f490e (diff) | |
| download | sssd-eafbc66c2ff6365478e62a8df3fd005bf80e5c7b.tar.gz sssd-eafbc66c2ff6365478e62a8df3fd005bf80e5c7b.tar.xz sssd-eafbc66c2ff6365478e62a8df3fd005bf80e5c7b.zip | |
resolv: Use the same default timeout for SRV queries as previously
When we changed the resolver code to use the TTL values from the DNS
queries instead of harcoded ones, we changed the default value by
accident.
Add a separate SRV TTL that is backwards-compatible with the old
harcoded value.
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/resolv/async_resolv.c | 4 | ||||
| -rw-r--r-- | src/resolv/async_resolv.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/resolv/async_resolv.c b/src/resolv/async_resolv.c index c9657ef41..103592420 100644 --- a/src/resolv/async_resolv.c +++ b/src/resolv/async_resolv.c @@ -1757,8 +1757,10 @@ resolv_getsrv_done(void *arg, int status, int timeouts, unsigned char *abuf, int state->reply_list = reply_list; ok = resolv_get_ttl(abuf, alen, &state->ttl); if (ok == false) { - state->ttl = RESOLV_DEFAULT_TTL; + DEBUG(SSSDBG_MINOR_FAILURE, "Could not read TTL, using the default..\n"); + state->ttl = RESOLV_DEFAULT_SRV_TTL; } + DEBUG(SSSDBG_TRACE_LIBS, "Using TTL [%"PRIu32"]\n", state->ttl); tevent_req_done(req); return; diff --git a/src/resolv/async_resolv.h b/src/resolv/async_resolv.h index 109779bb9..876abff14 100644 --- a/src/resolv/async_resolv.h +++ b/src/resolv/async_resolv.h @@ -36,6 +36,10 @@ #define RESOLV_DEFAULT_TTL 7200 #endif /* RESOLV_DEFAULT_TTL */ +#ifndef RESOLV_DEFAULT_SRV_TTL +#define RESOLV_DEFAULT_SRV_TTL 14400 +#endif /* RESOLV_DEFAULT_SRV_TTL */ + #include "util/util.h" /* |