Seems that when I sent the v2 of 7579cf99 and ac35fe74 I attached the wrong patches that ended up being pushed. Those patches were incomplete as there are still some leftovers.
My bad, sorry :-\ See these 2 attached patches Best Regards, -- Fabiano Fidêncio
From 44a4238a169fa885478a2b3189af1c0e0a7a3692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fiden...@redhat.com> Date: Tue, 30 Aug 2016 18:17:46 +0200 Subject: [PATCH 1/2] 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 <fiden...@redhat.com> --- 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 b3f04ac..fb07127 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 8fcd1a5..575a124 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 df10538..a2c3fa2 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 5e69414..b2f20c5 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.7.4
From 19ab71baeacfcbe45d28deaeae82012551c05968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fiden...@redhat.com> Date: Tue, 30 Aug 2016 18:25:21 +0200 Subject: [PATCH 2/2] MONITOR: Remove leftovers from kill_service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Seems that wen I sent the v2 of ac35fe74 I attached the wrong pacth that ended up being pushed. The patch was incomplete as there are still some leftovers. The .po and sssd-docs.pot were not touched as I do believe they are autogenerated from Zanata. Related: https://fedorahosted.org/sssd/ticket/3052 Signed-off-by: Fabiano Fidêncio <fiden...@redhat.com> --- src/config/SSSDConfig/__init__.py.in | 1 - src/config/SSSDConfigTest.py | 3 --- src/config/cfg_rules.ini | 10 ---------- src/config/etc/sssd.api.conf | 2 -- 4 files changed, 16 deletions(-) diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index fb07127..0191920 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -46,7 +46,6 @@ option_strings = { 'debug_microseconds' : _('Include microseconds in timestamps in debug logs'), 'debug_to_files' : _('Write debug messages to logfiles'), 'timeout' : _('Watchdog timeout before restarting service'), - 'force_timeout' : _('Timeout between three failed ping checks and forcibly killing the service'), 'command' : _('Command to start service'), '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'), diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 575a124..6a0fdf0 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -293,7 +293,6 @@ class SSSDConfigTestSSSDService(unittest.TestCase): 'services', 'domains', 'timeout', - 'force_timeout', 'sbus_timeout', 're_expression', 'full_name_format', @@ -505,7 +504,6 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'min_id', 'max_id', 'timeout', - 'force_timeout', 'offline_timeout', 'try_inotify', 'command', @@ -874,7 +872,6 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'min_id', 'max_id', 'timeout', - 'force_timeout', 'offline_timeout', 'try_inotify', 'command', diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini index a2c3fa2..5e24806 100644 --- a/src/config/cfg_rules.ini +++ b/src/config/cfg_rules.ini @@ -23,7 +23,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description # Monitor service @@ -54,7 +53,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description # Name service @@ -92,7 +90,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description # Authentication service @@ -125,7 +122,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description # sudo service @@ -146,7 +142,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description # autofs service @@ -166,7 +161,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description # ssh service @@ -188,7 +182,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description # PAC responder @@ -209,7 +202,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description # InfoPipe responder @@ -229,7 +221,6 @@ option = command option = reconnection_retries option = fd_limit option = client_idle_timeout -option = force_timeout option = description #Available provider types @@ -250,7 +241,6 @@ option = timeout option = try_inotify option = enumerate option = subdomain_enumerate -option = force_timeout option = offline_timeout option = cache_credentials option = cache_credentials_minimal_first_factor_length diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index b2f20c5..525f939 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -13,7 +13,6 @@ command = str, None, false reconnection_retries = int, None, false fd_limit = int, None, false client_idle_timeout = int, None, false -force_timeout = int, None, false description = str, None, false [sssd] @@ -119,7 +118,6 @@ timeout = int, None, false try_inotify = bool, None, false enumerate = bool, None, false subdomain_enumerate = str, None, false -force_timeout = int, None, false offline_timeout = int, None, false cache_credentials = bool, None, false cache_credentials_minimal_first_factor_length = int, None, false -- 2.7.4
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
