|
 |
b2d430 |
From c54b38573a93d1176a44935ba310e590904edb92 Mon Sep 17 00:00:00 2001
|
|
|
b2d430 |
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
b2d430 |
Date: Fri, 12 Aug 2016 13:23:16 +0200
|
|
|
b2d430 |
Subject: [PATCH 089/102] CONFIG: full_name_format 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 cc4d1af16820b15595b60c3df15220fb852eb897)
|
|
|
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 7856c4c6b2d675b7f7f0f5f2048086044e8fb5ea..3114d1da9fe8e833ae4050ac343ba2763dc56e68 100644
|
|
|
b2d430 |
--- a/src/config/SSSDConfig/__init__.py.in
|
|
|
b2d430 |
+++ b/src/config/SSSDConfig/__init__.py.in
|
|
|
b2d430 |
@@ -163,6 +163,7 @@ option_strings = {
|
|
|
b2d430 |
'subdomain_refresh_interval' : _('How often should subdomains list be refreshed'),
|
|
|
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 |
|
|
|
b2d430 |
# [provider/ipa]
|
|
|
b2d430 |
'ipa_domain' : _('IPA domain'),
|
|
|
b2d430 |
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
index 332d8702d983b6ec8bf12ec781a1bbf296b552e0..bfb247ac45f752397000d43c54a20e57c6fbd9a5 100755
|
|
|
b2d430 |
--- a/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
+++ b/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
@@ -560,6 +560,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
|
|
|
b2d430 |
'realmd_tags',
|
|
|
b2d430 |
'subdomain_refresh_interval',
|
|
|
b2d430 |
'subdomain_inherit',
|
|
|
b2d430 |
+ 'full_name_format',
|
|
|
b2d430 |
'cached_auth_timeout']
|
|
|
b2d430 |
|
|
|
b2d430 |
self.assertTrue(type(options) == dict,
|
|
|
b2d430 |
@@ -927,6 +928,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
|
|
|
b2d430 |
'realmd_tags',
|
|
|
b2d430 |
'subdomain_refresh_interval',
|
|
|
b2d430 |
'subdomain_inherit',
|
|
|
b2d430 |
+ 'full_name_format',
|
|
|
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 09f53fa41eb2904f11a78af333b6d79619d2759c..febe4289832f3778b7e974ef4e8b3f6d9d8bffd8 100644
|
|
|
b2d430 |
--- a/src/config/cfg_rules.ini
|
|
|
b2d430 |
+++ b/src/config/cfg_rules.ini
|
|
|
b2d430 |
@@ -287,6 +287,7 @@ option = subdomain_refresh_interval
|
|
|
b2d430 |
option = subdomain_inherit
|
|
|
b2d430 |
option = cached_auth_timeout
|
|
|
b2d430 |
option = wildcard_limit
|
|
|
b2d430 |
+option = full_name_format
|
|
|
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 737f0e149d56bd07b078cb83acbc43ea2ed3a057..2a43b8b68051c5133abc65a78f0d4a5561e760bd 100644
|
|
|
b2d430 |
--- a/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
+++ b/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
@@ -147,6 +147,7 @@ realmd_tags = str, None, false
|
|
|
b2d430 |
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 |
|
|
|
b2d430 |
#Entry cache timeouts
|
|
|
b2d430 |
entry_cache_user_timeout = int, None, false
|
|
|
b2d430 |
--
|
|
|
b2d430 |
2.4.11
|
|
|
b2d430 |
|