summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Židek <mzidek@redhat.com>2016-07-11 13:11:41 +0200
committerLukas Slebodnik <lslebodn@redhat.com>2016-07-12 15:22:39 +0200
commitfc04d11c2fdde0bfe280c6030df2b1d6bf15ce63 (patch)
treeb3e95b46afe5a48e6e177d69288326a0148658e0
parentf9d3aec54d19a771a6eafe09ba6d445cc094bfae (diff)
downloadsssd-fc04d11c2fdde0bfe280c6030df2b1d6bf15ce63.zip
sssd-fc04d11c2fdde0bfe280c6030df2b1d6bf15ce63.tar.gz
sssd-fc04d11c2fdde0bfe280c6030df2b1d6bf15ce63.tar.xz
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>
-rw-r--r--src/config/SSSDConfig/__init__.py.in2
-rwxr-xr-xsrc/config/SSSDConfigTest.py3
-rw-r--r--src/config/cfg_rules.ini2
-rw-r--r--src/config/etc/sssd.api.conf2
4 files changed, 5 insertions, 4 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index 52af138..ebdd049 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 6ec3023..5fa9bce 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 d738ddf..ae4a9af 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 9114659..df6bdeb 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