|
 |
b2d430 |
From 5e8d4f0107c5e6f1836740945b610a54c216bd7f Mon Sep 17 00:00:00 2001
|
|
|
b2d430 |
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
|
|
|
b2d430 |
Date: Mon, 11 Jul 2016 13:34:03 +0200
|
|
|
b2d430 |
Subject: [PATCH 18/18] config: Add config_file_version to schema
|
|
|
b2d430 |
MIME-Version: 1.0
|
|
|
b2d430 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b2d430 |
Content-Transfer-Encoding: 8bit
|
|
|
b2d430 |
|
|
|
b2d430 |
Resolves:
|
|
|
b2d430 |
https://fedorahosted.org/sssd/ticket/3068
|
|
|
b2d430 |
|
|
|
b2d430 |
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
|
b2d430 |
(cherry picked from commit aeab20358006d728a284f969f92f3890498cd651)
|
|
|
b2d430 |
---
|
|
|
b2d430 |
src/config/SSSDConfigTest.py | 1 +
|
|
|
b2d430 |
src/config/cfg_rules.ini | 1 +
|
|
|
b2d430 |
src/config/etc/sssd.api.conf | 1 +
|
|
|
b2d430 |
3 files changed, 3 insertions(+)
|
|
|
b2d430 |
|
|
|
b2d430 |
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
index 5fa9bce8e6502c0ebf42671058c5e3d5de00ea0d..332d8702d983b6ec8bf12ec781a1bbf296b552e0 100755
|
|
|
b2d430 |
--- a/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
+++ b/src/config/SSSDConfigTest.py
|
|
|
b2d430 |
@@ -289,6 +289,7 @@ class SSSDConfigTestSSSDService(unittest.TestCase):
|
|
|
b2d430 |
|
|
|
b2d430 |
options = service.list_options()
|
|
|
b2d430 |
control_list = [
|
|
|
b2d430 |
+ 'config_file_version',
|
|
|
b2d430 |
'services',
|
|
|
b2d430 |
'domains',
|
|
|
b2d430 |
'timeout',
|
|
|
b2d430 |
diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini
|
|
|
b2d430 |
index 5c8d05a817331dd23fd7e349719bd4b44a5bdd02..635c078436e8ca47f60e8d82341cb131469fe4c9 100644
|
|
|
b2d430 |
--- a/src/config/cfg_rules.ini
|
|
|
b2d430 |
+++ b/src/config/cfg_rules.ini
|
|
|
b2d430 |
@@ -39,6 +39,7 @@ option = user
|
|
|
b2d430 |
option = default_domain_suffix
|
|
|
b2d430 |
option = certificate_verification
|
|
|
b2d430 |
option = override_space
|
|
|
b2d430 |
+option = config_file_version
|
|
|
b2d430 |
|
|
|
b2d430 |
[rule/allowed_nss_options]
|
|
|
b2d430 |
validator = ini_allowed_options
|
|
|
b2d430 |
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
index e4011a384cdb3fb3bce93494cbb278ec2622ee40..737f0e149d56bd07b078cb83acbc43ea2ed3a057 100644
|
|
|
b2d430 |
--- a/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
+++ b/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
@@ -19,6 +19,7 @@ diag_cmd = str, None, false
|
|
|
b2d430 |
|
|
|
b2d430 |
[sssd]
|
|
|
b2d430 |
# Monitor service
|
|
|
b2d430 |
+config_file_version = int, None, false
|
|
|
b2d430 |
services = list, str, true, nss, pam
|
|
|
b2d430 |
domains = list, str, true
|
|
|
b2d430 |
sbus_timeout = int, None, false
|
|
|
b2d430 |
--
|
|
|
b2d430 |
2.4.11
|
|
|
b2d430 |
|