summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabiano Fidêncio <fidencio@redhat.com>2016-08-30 18:17:46 +0200
committerLukas Slebodnik <lslebodn@redhat.com>2016-08-31 09:13:35 +0200
commite04df9feca0c9877c69aa46450d04c556bcb23ad (patch)
treece97e1a7fcae085a33b2ebcaadde0ca731e97dee
parent1384d0ce6ea741aefb56b0006b6268d76e6cc2c2 (diff)
downloadsssd-e04df9feca0c9877c69aa46450d04c556bcb23ad.tar.gz
sssd-e04df9feca0c9877c69aa46450d04c556bcb23ad.tar.xz
sssd-e04df9feca0c9877c69aa46450d04c556bcb23ad.zip
MONITOR: Remove leftovers from diag_cmd
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>
-rw-r--r--src/config/SSSDConfig/__init__.py.in1
-rwxr-xr-xsrc/config/SSSDConfigTest.py1
-rw-r--r--src/config/cfg_rules.ini9
-rw-r--r--src/config/etc/sssd.api.conf1
4 files changed, 0 insertions, 12 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index b3f04ac26..fb0712702 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 8fcd1a55c..575a12450 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 df10538de..a2c3fa2d5 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 5e69414f2..b2f20c5b7 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