From c54b38573a93d1176a44935ba310e590904edb92 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 12 Aug 2016 13:23:16 +0200 Subject: [PATCH 089/102] CONFIG: full_name_format is an allowed option for all domains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Lukáš Slebodník (cherry picked from commit cc4d1af16820b15595b60c3df15220fb852eb897) --- src/config/SSSDConfig/__init__.py.in | 1 + src/config/SSSDConfigTest.py | 2 ++ src/config/cfg_rules.ini | 1 + src/config/etc/sssd.api.conf | 1 + 4 files changed, 5 insertions(+) diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 7856c4c6b2d675b7f7f0f5f2048086044e8fb5ea..3114d1da9fe8e833ae4050ac343ba2763dc56e68 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -163,6 +163,7 @@ option_strings = { 'subdomain_refresh_interval' : _('How often should subdomains list be refreshed'), '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'), # [provider/ipa] 'ipa_domain' : _('IPA domain'), diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 332d8702d983b6ec8bf12ec781a1bbf296b552e0..bfb247ac45f752397000d43c54a20e57c6fbd9a5 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -560,6 +560,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'realmd_tags', 'subdomain_refresh_interval', 'subdomain_inherit', + 'full_name_format', 'cached_auth_timeout'] self.assertTrue(type(options) == dict, @@ -927,6 +928,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'realmd_tags', 'subdomain_refresh_interval', 'subdomain_inherit', + 'full_name_format', 'cached_auth_timeout'] self.assertTrue(type(options) == dict, diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini index 09f53fa41eb2904f11a78af333b6d79619d2759c..febe4289832f3778b7e974ef4e8b3f6d9d8bffd8 100644 --- a/src/config/cfg_rules.ini +++ b/src/config/cfg_rules.ini @@ -287,6 +287,7 @@ option = subdomain_refresh_interval option = subdomain_inherit option = cached_auth_timeout option = wildcard_limit +option = full_name_format #Entry cache timeouts option = entry_cache_user_timeout diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index 737f0e149d56bd07b078cb83acbc43ea2ed3a057..2a43b8b68051c5133abc65a78f0d4a5561e760bd 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -147,6 +147,7 @@ realmd_tags = str, None, false subdomain_refresh_interval = int, None, false subdomain_inherit = str, None, false cached_auth_timeout = int, None, false +full_name_format = str, None, false #Entry cache timeouts entry_cache_user_timeout = int, None, false -- 2.4.11