summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2012-11-05 10:56:34 -0500
committerJakub Hrozek <jhrozek@redhat.com>2012-11-11 23:39:43 +0100
commit4d84e12f003f33fac68da4f1d77cea5d969677b2 (patch)
tree68fbd3b1332f0710afa3ff90664c8143e6d1acb0
parent784d25fbf9bea4a988ce1db687c0eecf9cf6226b (diff)
downloadsssd-4d84e12f003f33fac68da4f1d77cea5d969677b2.tar.gz
sssd-4d84e12f003f33fac68da4f1d77cea5d969677b2.tar.xz
sssd-4d84e12f003f33fac68da4f1d77cea5d969677b2.zip
SSSDConfig: Locate the force_timeout option in the correct sections
-rwxr-xr-xsrc/config/SSSDConfigTest.py2
-rw-r--r--src/config/etc/sssd.api.conf3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index 4b26b7469..fdfd3a830 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -486,6 +486,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
'min_id',
'max_id',
'timeout',
+ 'force_timeout',
'try_inotify',
'command',
'enumerate',
@@ -824,6 +825,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
'min_id',
'max_id',
'timeout',
+ 'force_timeout',
'try_inotify',
'command',
'enumerate',
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index 2ba47d716..c494e96bb 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -11,13 +11,13 @@ command = str, None, false
reconnection_retries = int, None, false
fd_limit = int, None, false
client_idle_timeout = int, None, false
+force_timeout = int, None, false
[sssd]
# Monitor service
services = list, str, true, nss, pam
domains = list, str, true
timeout = int, None, false
-force_timeout = int, None, false
sbus_timeout = int, None, false
re_expression = str, None, false
full_name_format = str, None, false
@@ -93,6 +93,7 @@ max_id = int, None, false
timeout = int, None, false
try_inotify = bool, None, false
enumerate = bool, None, false
+force_timeout = int, None, false
cache_credentials = bool, None, false
store_legacy_passwords = bool, None, false
use_fully_qualified_names = bool, None, false