diff options
| author | Justin Stephenson <jstephen@redhat.com> | 2017-05-22 15:21:17 -0400 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2017-05-26 15:07:56 +0200 |
| commit | 50c06ae6737dd07ddd14f836e815eafa34bd0b7b (patch) | |
| tree | 6c94dfd2c164a472a0e75fb7a596bbcba2b1f37d | |
| parent | db4dbb89e6c26bf4e99bb22263594980202fb83d (diff) | |
| download | sssd-50c06ae6737dd07ddd14f836e815eafa34bd0b7b.tar.gz sssd-50c06ae6737dd07ddd14f836e815eafa34bd0b7b.tar.xz sssd-50c06ae6737dd07ddd14f836e815eafa34bd0b7b.zip | |
CONFIG: Add subdomain_homedir to config locations
Option subdomain_homedir was missing from Python config API an
cfg_rules leading to config file validation failures. Add this option
into the necessary locations similar to other provider-generic domain
options.
Resolves:
https://pagure.io/SSSD/sssd/issue/3389
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
(cherry picked from commit beab60d88fc07d463f6fb3756c8f3d29bdd78827)
| -rw-r--r-- | src/config/SSSDConfig/__init__.py.in | 1 | ||||
| -rwxr-xr-x | src/config/SSSDConfigTest.py | 2 | ||||
| -rw-r--r-- | src/config/etc/sssd.api.conf | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 345d108de..d950e0358 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -159,6 +159,7 @@ option_strings = { 'subdomain_enumerate' : _('Control enumeration of trusted domains'), 'subdomain_refresh_interval' : _('How often should subdomains list be refreshed'), 'subdomain_inherit' : _('List of options that should be inherited into a subdomain'), + 'subdomain_homedir' : _('Default subdomain homedir value'), 'cached_auth_timeout' : _('How long can cached credentials be used for cached authentication'), 'full_name_format' : _('Printf-compatible format for displaying fully-qualified names'), 're_expression' : _('Regex to parse username and domain'), diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index cb9891125..3344e1ad4 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -557,6 +557,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'realmd_tags', 'subdomain_refresh_interval', 'subdomain_inherit', + 'subdomain_homedir', 'full_name_format', 're_expression', 'cached_auth_timeout'] @@ -925,6 +926,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'realmd_tags', 'subdomain_refresh_interval', 'subdomain_inherit', + 'subdomain_homedir', 'full_name_format', 're_expression', 'cached_auth_timeout'] diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index ab72b9f5f..ccbee87d5 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -142,6 +142,7 @@ description = str, None, false realmd_tags = str, None, false subdomain_refresh_interval = int, None, false subdomain_inherit = str, None, false +subdomain_homedir = str, None, false cached_auth_timeout = int, None, false full_name_format = str, None, false re_expression = str, None, false |