From 83bc461f812b3c3df260b5f75d84b34bb1135062 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Mon, 26 Apr 2010 13:02:04 -0400
Subject: Add dns_resolver_timeout option

We had a hard-coded timeout of five seconds for DNS lookups in the
async resolver. This patch adds an option 'dns_resolver_timeout'
to specify this value (Default: 5)
---
 src/config/SSSDConfig.py     | 1 +
 src/config/SSSDConfigTest.py | 2 ++
 src/config/etc/sssd.api.conf | 1 +
 3 files changed, 4 insertions(+)

(limited to 'src/config')

diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py
index 6dd8cac2b..18df97904 100644
--- a/src/config/SSSDConfig.py
+++ b/src/config/SSSDConfig.py
@@ -81,6 +81,7 @@ option_strings = {
     'entry_cache_timeout' : _('Entry cache timeout length (seconds)'),
     '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_timeout' : _('How long to wait for replies from DNS when resolving servers (seconds)'),
 
     # [provider/ipa]
     'ipa_domain' : _('IPA domain'),
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index 127ad22cf..e88996534 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -478,6 +478,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
             'entry_cache_timeout',
             'lookup_family_order',
             'account_cache_expiration',
+            'dns_resolver_timeout',
             'id_provider',
             'auth_provider',
             'access_provider',
@@ -794,6 +795,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
             'entry_cache_timeout',
             'account_cache_expiration',
             'lookup_family_order',
+            'dns_resolver_timeout',
             'id_provider',
             'auth_provider',
             'access_provider',
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index 3347d9fa4..7d0e20c77 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -58,6 +58,7 @@ lookup_family_order = str, None, false
 account_cache_expiration = int, None, false
 filter_users = list, str, false
 filter_groups = list, str, false
+dns_resolver_timeout = int, None, false
 
 # Special providers
 [provider/permit]
-- 
cgit