|
 |
bb7cd1 |
From 39864f9ce41ce892fe3cafb769584173299f49f7 Mon Sep 17 00:00:00 2001
|
|
|
bb7cd1 |
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
|
|
|
bb7cd1 |
Date: Tue, 4 Apr 2017 19:07:12 +0200
|
|
|
bb7cd1 |
Subject: [PATCH 144/152] VALIDATORS: Remove application section domain
|
|
|
bb7cd1 |
MIME-Version: 1.0
|
|
|
bb7cd1 |
Content-Type: text/plain; charset=UTF-8
|
|
|
bb7cd1 |
Content-Transfer-Encoding: 8bit
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
Application domains can use the same options as normal domains section
|
|
|
bb7cd1 |
with one more additional option.
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
We could either duplicate all options from the domain section also in
|
|
|
bb7cd1 |
the application domain section + add the one additional option or
|
|
|
bb7cd1 |
add this one option to the domain section even though it is not meant
|
|
|
bb7cd1 |
to be used there to avoid duplication of all domain options in the
|
|
|
bb7cd1 |
rule for application section.
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
It would be could to enhance the validators in libini to allow
|
|
|
bb7cd1 |
something like 'include' section in order to avoid this issue
|
|
|
bb7cd1 |
in the future.
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
Resolves:
|
|
|
bb7cd1 |
https://pagure.io/SSSD/sssd/issue/3356
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
|
bb7cd1 |
---
|
|
|
bb7cd1 |
src/config/cfg_rules.ini | 5 +----
|
|
|
bb7cd1 |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini
|
|
|
bb7cd1 |
index 4b30e8fc43b50844023e7fffa607a59530a302f0..a30fe57e262716abeb2d2af9c3add326122ee4ca 100644
|
|
|
bb7cd1 |
--- a/src/config/cfg_rules.ini
|
|
|
bb7cd1 |
+++ b/src/config/cfg_rules.ini
|
|
|
bb7cd1 |
@@ -694,10 +694,7 @@ option = ldap_user_uid_number
|
|
|
bb7cd1 |
option = ldap_user_uuid
|
|
|
bb7cd1 |
option = ldap_use_tokengroups
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
-[rule/allowed_application_options]
|
|
|
bb7cd1 |
-validator = ini_allowed_options
|
|
|
bb7cd1 |
-section_re = ^application/.*$
|
|
|
bb7cd1 |
-
|
|
|
bb7cd1 |
+# For application domains
|
|
|
bb7cd1 |
option = inherit_from
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
[rule/allowed_subdomain_options]
|
|
|
bb7cd1 |
--
|
|
|
bb7cd1 |
2.9.4
|
|
|
bb7cd1 |
|