summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Židek <mzidek@redhat.com>2016-07-11 13:03:28 +0200
committerLukas Slebodnik <lslebodn@redhat.com>2016-07-12 18:51:14 +0200
commit1b9b5477027d86a2afb2e72981253d108c5398da (patch)
treef7309b9ebed52a5238f737bb62a2ff4d7db524d7
parent75dead699a19dda7d8dfca89e2f97efbf0c264a2 (diff)
downloadsssd-1b9b5477027d86a2afb2e72981253d108c5398da.zip
sssd-1b9b5477027d86a2afb2e72981253d108c5398da.tar.gz
sssd-1b9b5477027d86a2afb2e72981253d108c5398da.tar.xz
config: Allow timeout for all sevices
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 <lslebodn@redhat.com>
-rw-r--r--src/confdb/confdb.h1
-rw-r--r--src/config/cfg_rules.ini7
-rw-r--r--src/config/etc/sssd.api.conf2
3 files changed, 8 insertions, 2 deletions
diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h
index 54b1cbc..cc8f66f 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 85a15be..5c8d05a 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 2d7c504..e4011a3 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