|
 |
b2d430 |
From 08f1019768f6fa569eccf4892e3b5b57372b971d 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:23:40 +0200
|
|
|
b2d430 |
Subject: [PATCH 14/14] config: Fix user_attributes
|
|
|
b2d430 |
MIME-Version: 1.0
|
|
|
b2d430 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b2d430 |
Content-Transfer-Encoding: 8bit
|
|
|
b2d430 |
|
|
|
b2d430 |
Fixes:
|
|
|
b2d430 |
https://fedorahosted.org/sssd/ticket/3068
|
|
|
b2d430 |
|
|
|
b2d430 |
Option user_attributes is also available in
|
|
|
b2d430 |
NSS responder, but not in PAC responder.
|
|
|
b2d430 |
|
|
|
b2d430 |
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
|
b2d430 |
(cherry picked from commit 0a172552ec16f3b84d127399551cad786da8fd9d)
|
|
|
b2d430 |
---
|
|
|
b2d430 |
src/config/SSSDConfig/__init__.py.in | 1 +
|
|
|
b2d430 |
src/config/cfg_rules.ini | 2 +-
|
|
|
b2d430 |
src/config/etc/sssd.api.conf | 2 +-
|
|
|
b2d430 |
3 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
b2d430 |
|
|
|
b2d430 |
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
|
|
|
b2d430 |
index ebdd049e4df7ac2349293d6ce3802e7349098273..b5e078d0118a15c10b43fbe050176943ec90e0ee 100644
|
|
|
b2d430 |
--- a/src/config/SSSDConfig/__init__.py.in
|
|
|
b2d430 |
+++ b/src/config/SSSDConfig/__init__.py.in
|
|
|
b2d430 |
@@ -82,6 +82,7 @@ option_strings = {
|
|
|
b2d430 |
'shell_fallback' : _('If a shell stored in central directory is allowed but not available, use this fallback'),
|
|
|
b2d430 |
'default_shell': _('Shell to use if the provider does not list one'),
|
|
|
b2d430 |
'memcache_timeout': _('How long will be in-memory cache records valid'),
|
|
|
b2d430 |
+ 'user_attributes': _('List of user attributes the NSS responder is allowed to publish'),
|
|
|
b2d430 |
|
|
|
b2d430 |
# [pam]
|
|
|
b2d430 |
'offline_credentials_expiration' : _('How long to allow cached logins between online logins (days)'),
|
|
|
b2d430 |
diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini
|
|
|
b2d430 |
index ae4a9af2cdfd622e1234e26ae7285ff4e47889dc..85a15be3493cf4b8c5a612b0f66ae4c86d39b1ab 100644
|
|
|
b2d430 |
--- a/src/config/cfg_rules.ini
|
|
|
b2d430 |
+++ b/src/config/cfg_rules.ini
|
|
|
b2d430 |
@@ -58,6 +58,7 @@ option = description
|
|
|
b2d430 |
option = diag_cmd
|
|
|
b2d430 |
|
|
|
b2d430 |
# Name service
|
|
|
b2d430 |
+option = user_attributes
|
|
|
b2d430 |
option = enum_cache_timeout
|
|
|
b2d430 |
option = entry_cache_nowait_percentage
|
|
|
b2d430 |
option = entry_negative_timeout
|
|
|
b2d430 |
@@ -192,7 +193,6 @@ option = diag_cmd
|
|
|
b2d430 |
|
|
|
b2d430 |
# PAC responder
|
|
|
b2d430 |
option = allowed_uids
|
|
|
b2d430 |
-option = user_attributes
|
|
|
b2d430 |
option = pac_lifetime
|
|
|
b2d430 |
|
|
|
b2d430 |
[rule/allowed_ifp_options]
|
|
|
b2d430 |
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
index df6bdeb392b33a1437d790027054ee5e7b33e724..2d7c5049f5e5bf9df6e5445ee6e5c62211bf1c45 100644
|
|
|
b2d430 |
--- a/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
+++ b/src/config/etc/sssd.api.conf
|
|
|
b2d430 |
@@ -50,6 +50,7 @@ shell_fallback = str, None, false
|
|
|
b2d430 |
default_shell = str, None, false
|
|
|
b2d430 |
get_domains_timeout = int, None, false
|
|
|
b2d430 |
memcache_timeout = int, None, false
|
|
|
b2d430 |
+user_attributes = str, None, false
|
|
|
b2d430 |
|
|
|
b2d430 |
[pam]
|
|
|
b2d430 |
# Authentication service
|
|
|
b2d430 |
@@ -86,7 +87,6 @@ ca_db = str, None, false
|
|
|
b2d430 |
[pac]
|
|
|
b2d430 |
# PAC responder
|
|
|
b2d430 |
allowed_uids = str, None, false
|
|
|
b2d430 |
-user_attributes = str, None, false
|
|
|
b2d430 |
pac_lifetime = int, None, false
|
|
|
b2d430 |
|
|
|
b2d430 |
[ifp]
|
|
|
b2d430 |
--
|
|
|
b2d430 |
2.4.11
|
|
|
b2d430 |
|