From 3904a70f86d793954822abc543783d57fb36c8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= Date: Mon, 11 Jul 2016 13:11:41 +0200 Subject: [PATCH 13/14] config: override_space is monitor's option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We read override_space from [sssd] not [nss] section. Resolves: https://fedorahosted.org/sssd/ticket/3068 Reviewed-by: Lukáš Slebodník (cherry picked from commit fc04d11c2fdde0bfe280c6030df2b1d6bf15ce63) --- src/config/SSSDConfig/__init__.py.in | 2 +- src/config/SSSDConfigTest.py | 3 ++- src/config/cfg_rules.ini | 2 +- src/config/etc/sssd.api.conf | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 52af1386c7b6fc858b27d6f1d9197a7906519fc1..ebdd049e4df7ac2349293d6ce3802e7349098273 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -63,6 +63,7 @@ option_strings = { 'default_domain_suffix' : _('Domain to add to names without a domain component.'), 'user' : _('The user to drop privileges to'), 'certificate_verification' : _('Tune certificate verification'), + 'override_space': _('All spaces in group or user names will be replaced with this character'), # [nss] 'enum_cache_timeout' : _('Enumeration cache timeout length (seconds)'), @@ -81,7 +82,6 @@ option_strings = { 'shell_fallback' : _('If a shell stored in central directory is allowed but not available, use this fallback'), 'default_shell': _('Shell to use if the provider does not list one'), 'memcache_timeout': _('How long will be in-memory cache records valid'), - 'override_space': _('All spaces in group or user names will be replaced with this character'), # [pam] 'offline_credentials_expiration' : _('How long to allow cached logins between online logins (days)'), diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 6ec30234e24b7b48ccab6a98e1f9396990509190..5fa9bce8e6502c0ebf42671058c5e3d5de00ea0d 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -310,7 +310,8 @@ class SSSDConfigTestSSSDService(unittest.TestCase): 'client_idle_timeout', 'diag_cmd', 'description', - 'certificate_verification'] + 'certificate_verification', + 'override_space'] self.assertTrue(type(options) == dict, "Options should be a dictionary") diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini index d738ddf5ac5c220dbf2c3c99782368c684072e3f..ae4a9af2cdfd622e1234e26ae7285ff4e47889dc 100644 --- a/src/config/cfg_rules.ini +++ b/src/config/cfg_rules.ini @@ -38,6 +38,7 @@ option = krb5_rcache_dir option = user option = default_domain_suffix option = certificate_verification +option = override_space [rule/allowed_nss_options] validator = ini_allowed_options @@ -75,7 +76,6 @@ option = shell_fallback option = default_shell option = get_domains_timeout option = memcache_timeout -option = override_space [rule/allowed_pam_options] validator = ini_allowed_options diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index 91146593d7fcda2930ff85e8ee3e889cc12af962..df6bdeb392b33a1437d790027054ee5e7b33e724 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -28,6 +28,7 @@ krb5_rcache_dir = str, None, false user = str, None, false default_domain_suffix = str, None, false certificate_verification = str, None, false +override_space = str, None, false [nss] # Name service @@ -49,7 +50,6 @@ shell_fallback = str, None, false default_shell = str, None, false get_domains_timeout = int, None, false memcache_timeout = int, None, false -override_space = str, None, false [pam] # Authentication service -- 2.4.11