From 18b2f16e2b086509cafb453943387fff2d1b0d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= Date: Mon, 11 Jul 2016 13:03:28 +0200 Subject: [PATCH 17/18] config: Allow timeout for all sevices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow option "timeout" for all sevices. Also remove unused macro CONFDB_SERVICE_TIMEOUT. Resolves: https://fedorahosted.org/sssd/ticket/3068 Reviewed-by: Lukáš Slebodník (cherry picked from commit 1b9b5477027d86a2afb2e72981253d108c5398da) --- src/confdb/confdb.h | 1 - src/config/cfg_rules.ini | 7 +++++++ src/config/etc/sssd.api.conf | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h index 54b1cbc82546a76013c35c6cd3b1924663e9bb23..cc8f66f02eb5ac10ced826326f80bbf5eda82ee1 100644 --- a/src/confdb/confdb.h +++ b/src/confdb/confdb.h @@ -58,7 +58,6 @@ #define CONFDB_SERVICE_DEBUG_TIMESTAMPS "debug_timestamps" #define CONFDB_SERVICE_DEBUG_MICROSECONDS "debug_microseconds" #define CONFDB_SERVICE_DEBUG_TO_FILES "debug_to_files" -#define CONFDB_SERVICE_TIMEOUT "timeout" #define CONFDB_SERVICE_FORCE_TIMEOUT "force_timeout" #define CONFDB_SERVICE_RECON_RETRIES "reconnection_retries" #define CONFDB_SERVICE_FD_LIMIT "fd_limit" diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini index 85a15be3493cf4b8c5a612b0f66ae4c86d39b1ab..5c8d05a817331dd23fd7e349719bd4b44a5bdd02 100644 --- a/src/config/cfg_rules.ini +++ b/src/config/cfg_rules.ini @@ -44,6 +44,7 @@ option = override_space validator = ini_allowed_options section_re = ^nss$ +option = timeout option = debug option = debug_level option = debug_timestamps @@ -82,6 +83,7 @@ option = memcache_timeout validator = ini_allowed_options section_re = ^pam$ +option = timeout option = debug option = debug_level option = debug_timestamps @@ -115,6 +117,7 @@ option = p11_child_timeout validator = ini_allowed_options section_re = ^sudo$ +option = timeout option = debug option = debug_level option = debug_timestamps @@ -136,6 +139,7 @@ option = sudo_inverse_order validator = ini_allowed_options section_re = ^autofs$ +option = timeout option = debug option = debug_level option = debug_timestamps @@ -156,6 +160,7 @@ option = autofs_negative_timeout validator = ini_allowed_options section_re = ^ssh$ +option = timeout option = debug option = debug_level option = debug_timestamps @@ -178,6 +183,7 @@ option = ca_db validator = ini_allowed_options section_re = ^pac$ +option = timeout option = debug option = debug_level option = debug_timestamps @@ -199,6 +205,7 @@ option = pac_lifetime validator = ini_allowed_options section_re = ^ifp$ +option = timeout option = debug option = debug_level option = debug_timestamps diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index 2d7c5049f5e5bf9df6e5445ee6e5c62211bf1c45..e4011a384cdb3fb3bce93494cbb278ec2622ee40 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -3,6 +3,7 @@ [service] # Options available to all services +timeout = int, None, false debug = int, None, false debug_level = int, None, false debug_timestamps = bool, None, false @@ -20,7 +21,6 @@ diag_cmd = str, None, false # Monitor service services = list, str, true, nss, pam domains = list, str, true -timeout = int, None, false sbus_timeout = int, None, false re_expression = str, None, false full_name_format = str, None, false -- 2.4.11