summaryrefslogtreecommitdiffstats
path: root/src/config
diff options
context:
space:
mode:
authorJustin Stephenson <jstephen@redhat.com>2017-05-22 15:21:17 -0400
committerLukas Slebodnik <lslebodn@redhat.com>2017-05-26 14:40:06 +0200
commitbeab60d88fc07d463f6fb3756c8f3d29bdd78827 (patch)
tree442c4d513555bac674ed4122518891172bb634aa /src/config
parentc92e49144978ad3b6c9fffa8803ebdad8f6f5b18 (diff)
downloadsssd-beab60d88fc07d463f6fb3756c8f3d29bdd78827.tar.gz
sssd-beab60d88fc07d463f6fb3756c8f3d29bdd78827.tar.xz
sssd-beab60d88fc07d463f6fb3756c8f3d29bdd78827.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>
Diffstat (limited to 'src/config')
-rw-r--r--src/config/SSSDConfig/__init__.py.in1
-rwxr-xr-xsrc/config/SSSDConfigTest.py2
-rw-r--r--src/config/cfg_rules.ini1
-rw-r--r--src/config/etc/sssd.api.conf1
4 files changed, 5 insertions, 0 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index 5ca31cfef..cc71cc9d0 100644
--- a/src/config/SSSDConfig/__init__.py.in
+++ b/src/config/SSSDConfig/__init__.py.in
@@ -188,6 +188,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 9b3175962..8677a585f 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -567,6 +567,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
'realmd_tags',
'subdomain_refresh_interval',
'subdomain_inherit',
+ 'subdomain_homedir',
'full_name_format',
're_expression',
'cached_auth_timeout']
@@ -936,6 +937,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/cfg_rules.ini b/src/config/cfg_rules.ini
index 64cb1474f..70be88364 100644
--- a/src/config/cfg_rules.ini
+++ b/src/config/cfg_rules.ini
@@ -351,6 +351,7 @@ option = description
option = realmd_tags
option = subdomain_refresh_interval
option = subdomain_inherit
+option = subdomain_homedir
option = cached_auth_timeout
option = wildcard_limit
option = full_name_format
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index f86589ece..48d3b53f6 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -172,6 +172,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