|
 |
b2d430 |
From 92302f81c25bc2b5ce9dbc2236c671d591fe69e0 Mon Sep 17 00:00:00 2001
|
|
|
b2d430 |
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
b2d430 |
Date: Fri, 12 Aug 2016 16:41:21 +0200
|
|
|
b2d430 |
Subject: [PATCH 090/102] CONFIG: re_expression is an allowed option for all
|
|
|
b2d430 |
domains
|
|
|
b2d430 |
MIME-Version: 1.0
|
|
|
b2d430 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b2d430 |
Content-Transfer-Encoding: 8bit
|
|
|
b2d430 |
|
|
|
b2d430 |
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
|
b2d430 |
(cherry picked from commit 6d19051c50c10fc4de056ebb385c63ec0ed221cb)
|
|
|
b2d430 |
---
|
|
|
b2d430 |
src/config/SSSDConfig/__init__.py.in | 1 +
|
|
|
b2d430 |
src/config/SSSDConfigTest.py | 2 ++
|
|
|
b2d430 |
src/config/cfg_rules.ini | 1 +
|
|
|
b2d430 |
src/config/etc/sssd.api.conf | 1 +
|
|
|
b2d430 |
4 files changed, 5 insertions(+)
|
|
|
b2d430 |
|
|
|
b2d430 |
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
|
|
|
b2d430 |
index 3114d1da9fe8e833ae4050ac343ba2763dc56e68..ac538788b9878dc2613cb48b7483d392cca41d47 100644
|
|
|
b2d430 |
--- a/src/config/SSSDConfig/__init__.py.in
|
|
|
b2d430 |
+++ b/src/config/SSSDConfig/__init__.py.in
|
|
|
b2d430 |
@@ -164,6 +164,7 @@ option_strings = {
|
|
|
b2d430 |
'subdomain_inherit' : _('List of options that should be inherited into a subdomain'),
|
|
|
b2d430 |
'cached_auth_timeout' : _('How long can cached credentials be used for cached authentication'),
|
|
|
b2d430 |
'full_name_format' : _('Printf-compatible format for displaying fully-qualified names'),
|
|
|
b2d430 |
+ 're_expression' : _('Regex to parse username and domain'),
|
|
|
b2d430 |
|
|
|
b2d430 |
# [provider/ipa]
|
|
|
b2d430 |
'ipa_domain' : _('IPA domain'),
|
|
|
b2d430 |
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
index bfb247ac45f752397000d43c54a20e57c6fbd9a5..00c688f1e57c5f481d3adba2fe0374145216bc33 100755
|
|
|
b2d430 |
--- a/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
+++ b/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
@@ -561,6 +561,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
|
|
|
b2d430 |
'subdomain_refresh_interval',
|
|
|
b2d430 |
'subdomain_inherit',
|
|
|
b2d430 |
'full_name_format',
|
|
|
b2d430 |
+ 're_expression',
|
|
|
b2d430 |
'cached_auth_timeout']
|
|
|
b2d430 |
|
|
|
b2d430 |
self.assertTrue(type(options) == dict,
|
|
|
b2d430 |
@@ -929,6 +930,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
|
|
|
b2d430 |
'subdomain_refresh_interval',
|
|
|
b2d430 |
'subdomain_inherit',
|
|
|
b2d430 |
'full_name_format',
|
|
|
b2d430 |
+ 're_expression',
|
|
|
b2d430 |
'cached_auth_timeout']
|
|
|
b2d430 |
|
|
|
b2d430 |
self.assertTrue(type(options) == dict,
|
|
|
b2d430 |
diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini
|
|
|
b2d430 |
index febe4289832f3778b7e974ef4e8b3f6d9d8bffd8..bd0116f334e2605e7671a208225761421511a75a 100644
|
|
|
b2d430 |
--- a/src/config/cfg_rules.ini
|
|
|
b2d430 |
+++ b/src/config/cfg_rules.ini
|
|
|
b2d430 |
@@ -288,6 +288,7 @@ option = subdomain_inherit
|
|
|
b2d430 |
option = cached_auth_timeout
|
|
|
b2d430 |
option = wildcard_limit
|
|
|
b2d430 |
option = full_name_format
|
|
|
b2d430 |
+option = re_expression
|
|
|
b2d430 |
|
|
|
b2d430 |
#Entry cache timeouts
|
|
|
b2d430 |
option = entry_cache_user_timeout
|
|
|
b2d430 |
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
index 2a43b8b68051c5133abc65a78f0d4a5561e760bd..5ac6f79521f5f776fc17319c3afb87d44961afca 100644
|
|
|
b2d430 |
--- a/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
+++ b/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
@@ -148,6 +148,7 @@ subdomain_refresh_interval = int, None, false
|
|
|
b2d430 |
subdomain_inherit = str, None, false
|
|
|
b2d430 |
cached_auth_timeout = int, None, false
|
|
|
b2d430 |
full_name_format = str, None, false
|
|
|
b2d430 |
+re_expression = str, None, false
|
|
|
b2d430 |
|
|
|
b2d430 |
#Entry cache timeouts
|
|
|
b2d430 |
entry_cache_user_timeout = int, None, false
|
|
|
b2d430 |
--
|
|
|
b2d430 |
2.4.11
|
|
|
b2d430 |
|