summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Židek <mzidek@redhat.com>2016-07-11 13:23:40 +0200
committerLukas Slebodnik <lslebodn@redhat.com>2016-07-12 15:22:44 +0200
commit0a172552ec16f3b84d127399551cad786da8fd9d (patch)
treea8e35af8f7f65e5d4214a5e82852f8858d4cff86
parentfc04d11c2fdde0bfe280c6030df2b1d6bf15ce63 (diff)
downloadsssd-0a172552ec16f3b84d127399551cad786da8fd9d.zip
sssd-0a172552ec16f3b84d127399551cad786da8fd9d.tar.gz
sssd-0a172552ec16f3b84d127399551cad786da8fd9d.tar.xz
config: Fix user_attributes
Fixes: https://fedorahosted.org/sssd/ticket/3068 Option user_attributes is also available in NSS responder, but not in PAC responder. Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
-rw-r--r--src/config/SSSDConfig/__init__.py.in1
-rw-r--r--src/config/cfg_rules.ini2
-rw-r--r--src/config/etc/sssd.api.conf2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index ebdd049..b5e078d 100644
--- a/src/config/SSSDConfig/__init__.py.in
+++ b/src/config/SSSDConfig/__init__.py.in
@@ -82,6 +82,7 @@ option_strings = {
'shell_fallback' : _('If a shell stored in central directory is allowed but not available, use this fallback'),
'default_shell': _('Shell to use if the provider does not list one'),
'memcache_timeout': _('How long will be in-memory cache records valid'),
+ 'user_attributes': _('List of user attributes the NSS responder is allowed to publish'),
# [pam]
'offline_credentials_expiration' : _('How long to allow cached logins between online logins (days)'),
diff --git a/src/config/cfg_rules.ini b/src/config/cfg_rules.ini
index ae4a9af..85a15be 100644
--- a/src/config/cfg_rules.ini
+++ b/src/config/cfg_rules.ini
@@ -58,6 +58,7 @@ option = description
option = diag_cmd
# Name service
+option = user_attributes
option = enum_cache_timeout
option = entry_cache_nowait_percentage
option = entry_negative_timeout
@@ -192,7 +193,6 @@ option = diag_cmd
# PAC responder
option = allowed_uids
-option = user_attributes
option = pac_lifetime
[rule/allowed_ifp_options]
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index df6bdeb..2d7c504 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -50,6 +50,7 @@ shell_fallback = str, None, false
default_shell = str, None, false
get_domains_timeout = int, None, false
memcache_timeout = int, None, false
+user_attributes = str, None, false
[pam]
# Authentication service
@@ -86,7 +87,6 @@ ca_db = str, None, false
[pac]
# PAC responder
allowed_uids = str, None, false
-user_attributes = str, None, false
pac_lifetime = int, None, false
[ifp]