|
 |
1cdfb00 |
From 9d68909e27641410dced44865aff0a11f77597ef Mon Sep 17 00:00:00 2001
|
|
|
1cdfb00 |
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
1cdfb00 |
Date: Tue, 3 Mar 2015 11:39:39 +0100
|
|
|
1cdfb00 |
Subject: [PATCH 05/99] resolv: Use the same default timeout for SRV queries as
|
|
|
1cdfb00 |
previously
|
|
|
1cdfb00 |
MIME-Version: 1.0
|
|
|
1cdfb00 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1cdfb00 |
Content-Transfer-Encoding: 8bit
|
|
|
1cdfb00 |
|
|
|
1cdfb00 |
When we changed the resolver code to use the TTL values from the DNS
|
|
|
1cdfb00 |
queries instead of harcoded ones, we changed the default value by
|
|
|
1cdfb00 |
accident.
|
|
|
1cdfb00 |
|
|
|
1cdfb00 |
Add a separate SRV TTL that is backwards-compatible with the old
|
|
|
1cdfb00 |
harcoded value.
|
|
|
1cdfb00 |
|
|
|
1cdfb00 |
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
|
1cdfb00 |
(cherry picked from commit eafbc66c2ff6365478e62a8df3fd005bf80e5c7b)
|
|
|
1cdfb00 |
---
|
|
|
1cdfb00 |
src/resolv/async_resolv.c | 4 +++-
|
|
|
1cdfb00 |
src/resolv/async_resolv.h | 4 ++++
|
|
|
1cdfb00 |
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
1cdfb00 |
|
|
|
1cdfb00 |
diff --git a/src/resolv/async_resolv.c b/src/resolv/async_resolv.c
|
|
|
1cdfb00 |
index 85c4d99a4ef3c5071353f176c78caba115286fe4..80e4922c576ce52ab895d62c822706e9e46024a0 100644
|
|
|
1cdfb00 |
--- a/src/resolv/async_resolv.c
|
|
|
1cdfb00 |
+++ b/src/resolv/async_resolv.c
|
|
|
1cdfb00 |
@@ -1776,8 +1776,10 @@ resolv_getsrv_done(void *arg, int status, int timeouts, unsigned char *abuf, int
|
|
|
1cdfb00 |
state->reply_list = reply_list;
|
|
|
1cdfb00 |
ok = resolv_get_ttl(abuf, alen, &state->ttl);
|
|
|
1cdfb00 |
if (ok == false) {
|
|
|
1cdfb00 |
- state->ttl = RESOLV_DEFAULT_TTL;
|
|
|
1cdfb00 |
+ DEBUG(SSSDBG_MINOR_FAILURE, "Could not read TTL, using the default..\n");
|
|
|
1cdfb00 |
+ state->ttl = RESOLV_DEFAULT_SRV_TTL;
|
|
|
1cdfb00 |
}
|
|
|
1cdfb00 |
+ DEBUG(SSSDBG_TRACE_LIBS, "Using TTL [%"PRIu32"]\n", state->ttl);
|
|
|
1cdfb00 |
|
|
|
1cdfb00 |
tevent_req_done(req);
|
|
|
1cdfb00 |
return;
|
|
|
1cdfb00 |
diff --git a/src/resolv/async_resolv.h b/src/resolv/async_resolv.h
|
|
|
1cdfb00 |
index 9b08f12ae159d377b50b9ddfe9f71397a461635d..14cbdc5023705b164ccb775991b7790accc1f2cc 100644
|
|
|
1cdfb00 |
--- a/src/resolv/async_resolv.h
|
|
|
1cdfb00 |
+++ b/src/resolv/async_resolv.h
|
|
|
1cdfb00 |
@@ -42,6 +42,10 @@
|
|
|
1cdfb00 |
#define RESOLV_DEFAULT_TTL 7200
|
|
|
1cdfb00 |
#endif /* RESOLV_DEFAULT_TTL */
|
|
|
1cdfb00 |
|
|
|
1cdfb00 |
+#ifndef RESOLV_DEFAULT_SRV_TTL
|
|
|
1cdfb00 |
+#define RESOLV_DEFAULT_SRV_TTL 14400
|
|
|
1cdfb00 |
+#endif /* RESOLV_DEFAULT_SRV_TTL */
|
|
|
1cdfb00 |
+
|
|
|
1cdfb00 |
#include "util/util.h"
|
|
|
1cdfb00 |
|
|
|
1cdfb00 |
/*
|
|
|
1cdfb00 |
--
|
|
|
1cdfb00 |
2.4.0
|
|
|
1cdfb00 |
|