diff options
| author | Michal Židek <mzidek@redhat.com> | 2016-07-11 13:11:41 +0200 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2017-05-26 14:57:12 +0200 |
| commit | fa2cbce1cb2a76d4b4ad68de181d73320d4bff8a (patch) | |
| tree | 2d478fb261c62ca33492a7840af42c4fed282159 | |
| parent | e98d0ba216011756f2a340e2558149368146e229 (diff) | |
| download | sssd-fa2cbce1cb2a76d4b4ad68de181d73320d4bff8a.tar.gz sssd-fa2cbce1cb2a76d4b4ad68de181d73320d4bff8a.tar.xz sssd-fa2cbce1cb2a76d4b4ad68de181d73320d4bff8a.zip | |
config: override_space is monitor's option
We read override_space from [sssd] not
[nss] section.
Resolves:
https://fedorahosted.org/sssd/ticket/3068
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
(cherry picked from commit fc04d11c2fdde0bfe280c6030df2b1d6bf15ce63)
| -rw-r--r-- | src/config/SSSDConfig/__init__.py.in | 2 | ||||
| -rwxr-xr-x | src/config/SSSDConfigTest.py | 3 | ||||
| -rw-r--r-- | src/config/etc/sssd.api.conf | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 4b64c5c9e..4dbade2d9 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -61,6 +61,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)'), @@ -78,7 +79,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 cd2d74d48..37b6d4639 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -308,7 +308,8 @@ class SSSDConfigTestSSSDService(unittest.TestCase): 'fd_limit', 'client_idle_timeout', 'description', - 'certificate_verification'] + 'certificate_verification', + 'override_space'] self.assertTrue(type(options) == dict, "Options should be a dictionary") diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index 31657bd4e..7e0a16328 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -26,6 +26,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 @@ -46,7 +47,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 |