|
 |
d6181b |
From e97ff0adb62c89cfc7e75858b7e592e0303720b0 Mon Sep 17 00:00:00 2001
|
|
|
d6181b |
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
|
|
d6181b |
Date: Tue, 11 Jun 2019 14:01:17 +0200
|
|
|
d6181b |
Subject: [PATCH 11/12] failover: change default timeouts
|
|
|
d6181b |
|
|
|
d6181b |
Resolves:
|
|
|
d6181b |
https://pagure.io/SSSD/sssd/issue/3217
|
|
|
d6181b |
|
|
|
d6181b |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
d6181b |
Reviewed-by: Sumit Bose <sbose@redhat.com>
|
|
|
d6181b |
---
|
|
|
d6181b |
src/man/include/failover.xml | 6 +++---
|
|
|
d6181b |
src/man/sssd-ldap.5.xml | 2 +-
|
|
|
d6181b |
src/providers/ad/ad_opts.c | 2 +-
|
|
|
d6181b |
src/providers/data_provider_fo.c | 4 ++--
|
|
|
d6181b |
src/providers/ipa/ipa_opts.c | 2 +-
|
|
|
d6181b |
src/providers/ldap/ldap_opts.c | 2 +-
|
|
|
d6181b |
6 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
d6181b |
|
|
|
d6181b |
diff --git a/src/man/include/failover.xml b/src/man/include/failover.xml
|
|
|
d6181b |
index f2a01b933..288d91807 100644
|
|
|
d6181b |
--- a/src/man/include/failover.xml
|
|
|
d6181b |
+++ b/src/man/include/failover.xml
|
|
|
d6181b |
@@ -81,7 +81,7 @@
|
|
|
d6181b |
talk to a single DNS server before trying next one.
|
|
|
d6181b |
</para>
|
|
|
d6181b |
<para>
|
|
|
d6181b |
- Default: 2000
|
|
|
d6181b |
+ Default: 1000
|
|
|
d6181b |
</para>
|
|
|
d6181b |
</listitem>
|
|
|
d6181b |
</varlistentry>
|
|
|
d6181b |
@@ -97,7 +97,7 @@
|
|
|
d6181b |
hostname or discovery domain.
|
|
|
d6181b |
</para>
|
|
|
d6181b |
<para>
|
|
|
d6181b |
- Default: 6
|
|
|
d6181b |
+ Default: 2
|
|
|
d6181b |
</para>
|
|
|
d6181b |
</listitem>
|
|
|
d6181b |
</varlistentry>
|
|
|
d6181b |
@@ -113,7 +113,7 @@
|
|
|
d6181b |
queries or locating the site.
|
|
|
d6181b |
</para>
|
|
|
d6181b |
<para>
|
|
|
d6181b |
- Default: 6
|
|
|
d6181b |
+ Default: 4
|
|
|
d6181b |
</para>
|
|
|
d6181b |
</listitem>
|
|
|
d6181b |
</varlistentry>
|
|
|
d6181b |
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
|
|
|
d6181b |
index f0bc82db5..c205aea64 100644
|
|
|
d6181b |
--- a/src/man/sssd-ldap.5.xml
|
|
|
d6181b |
+++ b/src/man/sssd-ldap.5.xml
|
|
|
d6181b |
@@ -1432,7 +1432,7 @@
|
|
|
d6181b |
StartTLS operation.
|
|
|
d6181b |
</para>
|
|
|
d6181b |
<para>
|
|
|
d6181b |
- Default: 6
|
|
|
d6181b |
+ Default: 8
|
|
|
d6181b |
</para>
|
|
|
d6181b |
</listitem>
|
|
|
d6181b |
</varlistentry>
|
|
|
d6181b |
diff --git a/src/providers/ad/ad_opts.c b/src/providers/ad/ad_opts.c
|
|
|
d6181b |
index 978c395ef..3f7ec08b1 100644
|
|
|
d6181b |
--- a/src/providers/ad/ad_opts.c
|
|
|
d6181b |
+++ b/src/providers/ad/ad_opts.c
|
|
|
d6181b |
@@ -65,7 +65,7 @@ struct dp_option ad_def_ldap_opts[] = {
|
|
|
d6181b |
{ "ldap_default_authtok", DP_OPT_BLOB, NULL_BLOB, NULL_BLOB },
|
|
|
d6181b |
{ "ldap_search_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
{ "ldap_network_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
- { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
+ { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 8 }, NULL_NUMBER },
|
|
|
d6181b |
{ "ldap_tls_reqcert", DP_OPT_STRING, { "hard" }, NULL_STRING },
|
|
|
d6181b |
{ "ldap_user_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING },
|
|
|
d6181b |
{ "ldap_user_search_scope", DP_OPT_STRING, { "sub" }, NULL_STRING },
|
|
|
d6181b |
diff --git a/src/providers/data_provider_fo.c b/src/providers/data_provider_fo.c
|
|
|
d6181b |
index a7af3e2a5..c634b8d49 100644
|
|
|
d6181b |
--- a/src/providers/data_provider_fo.c
|
|
|
d6181b |
+++ b/src/providers/data_provider_fo.c
|
|
|
d6181b |
@@ -832,8 +832,8 @@ void _be_fo_set_port_status(struct be_ctx *ctx,
|
|
|
d6181b |
static struct dp_option dp_res_default_opts[] = {
|
|
|
d6181b |
{ "lookup_family_order", DP_OPT_STRING, { "ipv4_first" }, NULL_STRING },
|
|
|
d6181b |
{ "dns_resolver_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
- { "dns_resolver_op_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
- { "dns_resolver_server_timeout", DP_OPT_NUMBER, { .number = 2000 }, NULL_NUMBER },
|
|
|
d6181b |
+ { "dns_resolver_op_timeout", DP_OPT_NUMBER, { .number = 3 }, NULL_NUMBER },
|
|
|
d6181b |
+ { "dns_resolver_server_timeout", DP_OPT_NUMBER, { .number = 1000 }, NULL_NUMBER },
|
|
|
d6181b |
{ "dns_discovery_domain", DP_OPT_STRING, NULL_STRING, NULL_STRING },
|
|
|
d6181b |
DP_OPTION_TERMINATOR
|
|
|
d6181b |
};
|
|
|
d6181b |
diff --git a/src/providers/ipa/ipa_opts.c b/src/providers/ipa/ipa_opts.c
|
|
|
d6181b |
index c38a7da0e..7974cb8ea 100644
|
|
|
d6181b |
--- a/src/providers/ipa/ipa_opts.c
|
|
|
d6181b |
+++ b/src/providers/ipa/ipa_opts.c
|
|
|
d6181b |
@@ -76,7 +76,7 @@ struct dp_option ipa_def_ldap_opts[] = {
|
|
|
d6181b |
{ "ldap_default_authtok", DP_OPT_BLOB, NULL_BLOB, NULL_BLOB },
|
|
|
d6181b |
{ "ldap_search_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
{ "ldap_network_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
- { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
+ { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 8 }, NULL_NUMBER },
|
|
|
d6181b |
{ "ldap_tls_reqcert", DP_OPT_STRING, { "hard" }, NULL_STRING },
|
|
|
d6181b |
{ "ldap_user_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING },
|
|
|
d6181b |
{ "ldap_user_search_scope", DP_OPT_STRING, { "sub" }, NULL_STRING },
|
|
|
d6181b |
diff --git a/src/providers/ldap/ldap_opts.c b/src/providers/ldap/ldap_opts.c
|
|
|
d6181b |
index dc56f0712..616934a21 100644
|
|
|
d6181b |
--- a/src/providers/ldap/ldap_opts.c
|
|
|
d6181b |
+++ b/src/providers/ldap/ldap_opts.c
|
|
|
d6181b |
@@ -36,7 +36,7 @@ struct dp_option default_basic_opts[] = {
|
|
|
d6181b |
{ "ldap_default_authtok", DP_OPT_BLOB, NULL_BLOB, NULL_BLOB },
|
|
|
d6181b |
{ "ldap_search_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
{ "ldap_network_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
- { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
|
|
|
d6181b |
+ { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 8 }, NULL_NUMBER },
|
|
|
d6181b |
{ "ldap_tls_reqcert", DP_OPT_STRING, { "hard" }, NULL_STRING },
|
|
|
d6181b |
{ "ldap_user_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING },
|
|
|
d6181b |
{ "ldap_user_search_scope", DP_OPT_STRING, { "sub" }, NULL_STRING },
|
|
|
d6181b |
--
|
|
|
d6181b |
2.20.1
|
|
|
d6181b |
|