diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2016-08-12 16:41:21 +0200 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2017-05-26 15:07:56 +0200 |
| commit | 6757b4ad9bf9b6217b4198273c9022a7f0508bd3 (patch) | |
| tree | 3997b6bfac9c55d9b75fedc66df02e59e7f49ea7 | |
| parent | d849fd69b6c4fd9cb5bd8358ea78ad02fa797562 (diff) | |
| download | sssd-6757b4ad9bf9b6217b4198273c9022a7f0508bd3.tar.gz sssd-6757b4ad9bf9b6217b4198273c9022a7f0508bd3.tar.xz sssd-6757b4ad9bf9b6217b4198273c9022a7f0508bd3.zip | |
CONFIG: re_expression is an allowed option for all domains
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
(cherry picked from commit 6d19051c50c10fc4de056ebb385c63ec0ed221cb)
| -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 af7d3b265..09f6d1057 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -161,6 +161,7 @@ option_strings = { 'subdomain_inherit' : _('List of options that should be inherited into a subdomain'), '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'), # [provider/ipa] 'ipa_domain' : _('IPA domain'), diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 8cf0d915e..c909a7c3c 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -558,6 +558,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'subdomain_refresh_interval', 'subdomain_inherit', 'full_name_format', + 're_expression', 'cached_auth_timeout'] self.assertTrue(type(options) == dict, @@ -925,6 +926,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'subdomain_refresh_interval', 'subdomain_inherit', 'full_name_format', + 're_expression', 'cached_auth_timeout'] self.assertTrue(type(options) == dict, diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index 37c1e363d..969311450 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -144,6 +144,7 @@ subdomain_refresh_interval = int, None, false subdomain_inherit = str, None, false cached_auth_timeout = int, None, false full_name_format = str, None, false +re_expression = str, None, false #Entry cache timeouts entry_cache_user_timeout = int, None, false |