summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Zidek <mzidek@redhat.com>2013-07-04 13:32:07 +0200
committerJakub Hrozek <jhrozek@redhat.com>2013-07-24 13:54:33 +0200
commit6176eeeae6e75d3ce78eb98d46dc478541ba6282 (patch)
treedde99de32de70f0b588d2421aa12ad2669d0747e
parentbfd59d1a2d0d45125e5164ef12c425690d519f61 (diff)
downloadsssd-6176eeeae6e75d3ce78eb98d46dc478541ba6282.tar.gz
sssd-6176eeeae6e75d3ce78eb98d46dc478541ba6282.tar.xz
sssd-6176eeeae6e75d3ce78eb98d46dc478541ba6282.zip
Set default DNS resolution timeout to 6 seconds.
Partially solves ticket: https://fedorahosted.org/sssd/ticket/1966 To avoid the problem mentioned in the ticket above, option dns_discovery_domain must be set properly.
-rw-r--r--src/man/sssd.conf.5.xml2
-rw-r--r--src/providers/data_provider_fo.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index a0321df8b..4f01794d6 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -1660,7 +1660,7 @@ override_homedir = /home/%u
offline mode.
</para>
<para>
- Default: 5
+ Default: 6
</para>
</listitem>
</varlistentry>
diff --git a/src/providers/data_provider_fo.c b/src/providers/data_provider_fo.c
index 83294b59f..5f25ecc8d 100644
--- a/src/providers/data_provider_fo.c
+++ b/src/providers/data_provider_fo.c
@@ -774,8 +774,8 @@ void be_fo_set_port_status(struct be_ctx *ctx,
/* Resolver back end interface */
static struct dp_option dp_res_default_opts[] = {
{ "lookup_family_order", DP_OPT_STRING, { "ipv4_first" }, NULL_STRING },
- { "dns_resolver_timeout", DP_OPT_NUMBER, { .number = 5 }, NULL_NUMBER },
- { "dns_resolver_op_timeout", DP_OPT_NUMBER, { .number = 5 }, NULL_NUMBER },
+ { "dns_resolver_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
+ { "dns_resolver_op_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
{ "dns_discovery_domain", DP_OPT_STRING, NULL_STRING, NULL_STRING },
DP_OPTION_TERMINATOR
};