diff options
| author | Michal Židek <mzidek@redhat.com> | 2016-07-11 13:03:28 +0200 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2017-05-26 15:01:29 +0200 |
| commit | 3f9b38d702c0b22202b59fe2814df60b5aa42a43 (patch) | |
| tree | cdc6203f555f1bab20f07b1ad09c7fefc992a4d4 | |
| parent | d52104ff2122458da795387888c805691dd575e1 (diff) | |
| download | sssd-3f9b38d702c0b22202b59fe2814df60b5aa42a43.tar.gz sssd-3f9b38d702c0b22202b59fe2814df60b5aa42a43.tar.xz sssd-3f9b38d702c0b22202b59fe2814df60b5aa42a43.zip | |
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>
(cherry picked from commit 1b9b5477027d86a2afb2e72981253d108c5398da)
| -rw-r--r-- | src/confdb/confdb.h | 1 | ||||
| -rw-r--r-- | src/config/etc/sssd.api.conf | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h index 640df3437..6ae3a757f 100644 --- a/src/confdb/confdb.h +++ b/src/confdb/confdb.h @@ -55,7 +55,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/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index 2f68812f0..4e85a6f88 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_level = int, None, false debug_timestamps = bool, None, false debug_microseconds = bool, None, false @@ -18,7 +19,6 @@ description = 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 |