From 08f1019768f6fa569eccf4892e3b5b57372b971d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
Date: Mon, 11 Jul 2016 13:23:40 +0200
Subject: [PATCH 14/14] config: Fix user_attributes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
(cherry picked from commit 0a172552ec16f3b84d127399551cad786da8fd9d)
---
 src/config/SSSDConfig/__init__.py.in | 1 +
 src/config/cfg_rules.ini             | 2 +-
 src/config/etc/sssd.api.conf         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index ebdd049e4df7ac2349293d6ce3802e7349098273..b5e078d0118a15c10b43fbe050176943ec90e0ee 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 ae4a9af2cdfd622e1234e26ae7285ff4e47889dc..85a15be3493cf4b8c5a612b0f66ae4c86d39b1ab 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 df6bdeb392b33a1437d790027054ee5e7b33e724..2d7c5049f5e5bf9df6e5445ee6e5c62211bf1c45 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]
-- 
2.4.11