From 6176eeeae6e75d3ce78eb98d46dc478541ba6282 Mon Sep 17 00:00:00 2001
From: Michal Zidek <mzidek@redhat.com>
Date: Jul 24 2013 11:54:33 +0000
Subject: 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.

---

diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index a0321df..4f01794 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 83294b5..5f25ecc 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
 };