From 049f3906b9ef2041b5e1df666bd570379ae60718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Mon, 8 Jul 2019 11:35:28 +0200 Subject: [PATCH 12/12] config: add dns_resolver_op_timeout to option list Resolves: https://pagure.io/SSSD/sssd/issue/3217 Reviewed-by: Jakub Hrozek Reviewed-by: Sumit Bose --- src/config/SSSDConfig/__init__.py.in | 1 + src/config/SSSDConfigTest.py | 2 ++ src/config/cfg_rules.ini | 1 + src/config/etc/sssd.api.conf | 1 + 4 files changed, 5 insertions(+) diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 2d1214e16..ea7995410 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -172,6 +172,7 @@ option_strings = { 'lookup_family_order' : _('Restrict or prefer a specific address family when performing DNS lookups'), 'account_cache_expiration' : _('How long to keep cached entries after last successful login (days)'), 'dns_resolver_server_timeout' : _('How long should SSSD talk to single DNS server before trying next server (miliseconds)'), + 'dns_resolver_op_timeout' : _('How long should keep trying to resolve single DNS query (seconds)'), 'dns_resolver_timeout' : _('How long to wait for replies from DNS when resolving servers (seconds)'), 'dns_discovery_domain' : _('The domain part of service discovery DNS query'), 'override_gid' : _('Override GID value from the identity provider with this value'), diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 82b1a9700..95dfd677d 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -607,6 +607,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'lookup_family_order', 'account_cache_expiration', 'dns_resolver_server_timeout', + 'dns_resolver_op_timeout', 'dns_resolver_timeout', 'dns_discovery_domain', 'dyndns_update', @@ -978,6 +979,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'account_cache_expiration', 'lookup_family_order', 'dns_resolver_server_timeout', + 'dns_resolver_op_timeout', 'dns_resolver_timeout', 'dns_discovery_domain', 'dyndns_update', diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini index a2efb3a67..30040b595 100644 --- a/src/config/cfg_rules.ini +++ b/src/config/cfg_rules.ini @@ -368,6 +368,7 @@ option = pwd_expiration_warning option = filter_users option = filter_groups option = dns_resolver_server_timeout +option = dns_resolver_op_timeout option = dns_resolver_timeout option = dns_discovery_domain option = override_gid diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index 288b1cfe7..4a069f2db 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -171,6 +171,7 @@ pwd_expiration_warning = int, None, false filter_users = list, str, false filter_groups = list, str, false dns_resolver_server_timeout = int, None, false +dns_resolver_op_timeout = int, None, false dns_resolver_timeout = int, None, false dns_discovery_domain = str, None, false override_gid = int, None, false -- 2.20.1