141 lines
4.4 KiB
Diff
141 lines
4.4 KiB
Diff
From d58c29636abcd20ef8e90fae90d8754419c394fa Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
|
Date: Tue, 30 Aug 2016 18:17:46 +0200
|
|
Subject: [PATCH 33/39] MONITOR: Remove leftovers from diag_cmd
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Seems that when I sent the v2 of 7579cf99 I attached the wrong patch
|
|
that ended up being pushed.
|
|
That patch was incomplete as there are still some leftovers.
|
|
|
|
Related:
|
|
https://fedorahosted.org/sssd/ticket/3051
|
|
|
|
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
Reviewed-by: Petr Čech <pcech@redhat.com>
|
|
(cherry picked from commit e04df9feca0c9877c69aa46450d04c556bcb23ad)
|
|
---
|
|
src/config/SSSDConfig/__init__.py.in | 1 -
|
|
src/config/SSSDConfigTest.py | 1 -
|
|
src/config/cfg_rules.ini | 9 ---------
|
|
src/config/etc/sssd.api.conf | 1 -
|
|
4 files changed, 12 deletions(-)
|
|
|
|
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
|
|
index b3f04ac26309bb5b518fb87cd0dae2962e853179..fb071270208341f4e993fef95af4e8dc6b58fdbd 100644
|
|
--- a/src/config/SSSDConfig/__init__.py.in
|
|
+++ b/src/config/SSSDConfig/__init__.py.in
|
|
@@ -51,7 +51,6 @@ option_strings = {
|
|
'reconnection_retries' : _('Number of times to attempt connection to Data Providers'),
|
|
'fd_limit' : _('The number of file descriptors that may be opened by this responder'),
|
|
'client_idle_timeout' : _('Idle time before automatic disconnection of a client'),
|
|
- 'diag_cmd' : _('The command to run when a service ping times out'),
|
|
|
|
# [sssd]
|
|
'services' : _('SSSD Services to start'),
|
|
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
|
|
index 8fcd1a55c36035a7026f1fb4c8116aaae24e78ef..575a12450eec2e23e7fa30acf72030a0e7e07a50 100755
|
|
--- a/src/config/SSSDConfigTest.py
|
|
+++ b/src/config/SSSDConfigTest.py
|
|
@@ -309,7 +309,6 @@ class SSSDConfigTestSSSDService(unittest.TestCase):
|
|
'reconnection_retries',
|
|
'fd_limit',
|
|
'client_idle_timeout',
|
|
- 'diag_cmd',
|
|
'description',
|
|
'certificate_verification',
|
|
'override_space']
|
|
diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini
|
|
index df10538dee4a547a1b1af62a4cfe37b89e236b18..a2c3fa2d5994dc051b72be17e13c512d7f124141 100644
|
|
--- a/src/config/cfg_rules.ini
|
|
+++ b/src/config/cfg_rules.ini
|
|
@@ -25,7 +25,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
# Monitor service
|
|
option = services
|
|
@@ -57,7 +56,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
# Name service
|
|
option = user_attributes
|
|
@@ -96,7 +94,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
# Authentication service
|
|
option = offline_credentials_expiration
|
|
@@ -130,7 +127,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
# sudo service
|
|
option = sudo_timed
|
|
@@ -152,7 +148,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
# autofs service
|
|
option = autofs_negative_timeout
|
|
@@ -173,7 +168,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
# ssh service
|
|
option = ssh_hash_known_hosts
|
|
@@ -196,7 +190,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
# PAC responder
|
|
option = allowed_uids
|
|
@@ -218,7 +211,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
# InfoPipe responder
|
|
option = allowed_uids
|
|
@@ -239,7 +231,6 @@ option = fd_limit
|
|
option = client_idle_timeout
|
|
option = force_timeout
|
|
option = description
|
|
-option = diag_cmd
|
|
|
|
#Available provider types
|
|
option = id_provider
|
|
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
|
|
index 5e69414f2a490977bdaf1555325814ad61202071..b2f20c5b71fa6bf94656d6270ccd08385a88c06e 100644
|
|
--- a/src/config/etc/sssd.api.conf
|
|
+++ b/src/config/etc/sssd.api.conf
|
|
@@ -15,7 +15,6 @@ fd_limit = int, None, false
|
|
client_idle_timeout = int, None, false
|
|
force_timeout = int, None, false
|
|
description = str, None, false
|
|
-diag_cmd = str, None, false
|
|
|
|
[sssd]
|
|
# Monitor service
|
|
--
|
|
2.9.3
|
|
|