Reported in https://bugzilla.redhat.com/show_bug.cgi?id=1310141
>From 6ec0af3b301c80c19cd738f3e5682adb11732d89 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <[email protected]>
Date: Tue, 23 Feb 2016 12:06:34 +0100
Subject: [PATCH 1/2] MAN: Move subdomain_inherit to the correct man section

The option was in the general section, belongs to the domain section.
---
 src/man/sssd.conf.5.xml | 72 ++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index 
e03580bf7814c8e3a297dcfbcb5b50092cc3a8c7..6eaaded33b326a812944f03f398c9b5e24e72128
 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -508,42 +508,6 @@
                         </para>
                     </listitem>
                 </varlistentry>
-                <varlistentry>
-                    <term>subdomain_inherit (string)</term>
-                    <listitem>
-                        <para>
-                            Specifies a list of configuration parameters that
-                            should be inherited by a subdomain. Please note
-                            that only selected parameters can be inherited.
-                            Currently the following options can be inherited:
-                        </para>
-                        <para>
-                            ignore_group_members
-                        </para>
-                        <para>
-                            ldap_purge_cache_timeout
-                        </para>
-                        <para>
-                            ldap_use_tokengroups
-                        </para>
-                        <para>
-                            ldap_user_principal
-                        </para>
-                        <para>
-                            Example:
-                            <programlisting>
-subdomain_inherit = ldap_purge_cache_timeout
-                            </programlisting>
-                        </para>
-                        <para>
-                            Default: none
-                        </para>
-                        <para>
-                            Note: This option only works with the IPA and
-                            AD provider.
-                        </para>
-                    </listitem>
-                </varlistentry>
             </variablelist>
         </refsect2>
 
@@ -2264,6 +2228,42 @@ pam_account_locked_message = Account locked, please call 
help desk.
                 </varlistentry>
 
                 <varlistentry>
+                    <term>subdomain_inherit (string)</term>
+                    <listitem>
+                        <para>
+                            Specifies a list of configuration parameters that
+                            should be inherited by a subdomain. Please note
+                            that only selected parameters can be inherited.
+                            Currently the following options can be inherited:
+                        </para>
+                        <para>
+                            ignore_group_members
+                        </para>
+                        <para>
+                            ldap_purge_cache_timeout
+                        </para>
+                        <para>
+                            ldap_use_tokengroups
+                        </para>
+                        <para>
+                            ldap_user_principal
+                        </para>
+                        <para>
+                            Example:
+                            <programlisting>
+subdomain_inherit = ldap_purge_cache_timeout
+                            </programlisting>
+                        </para>
+                        <para>
+                            Default: none
+                        </para>
+                        <para>
+                            Note: This option only works with the IPA and
+                            AD provider.
+                        </para>
+                    </listitem>
+                </varlistentry>
+                <varlistentry>
                     <term>proxy_fast_alias (boolean)</term>
                     <listitem>
                         <para>
-- 
2.4.3

>From ee9756c982503e50f4339534f863fcaebfa1098b Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <[email protected]>
Date: Tue, 23 Feb 2016 12:07:29 +0100
Subject: [PATCH 2/2] MAN: Move proxy_fast_alias to the correct man section

The option was in the general section, belongs to the proxy section.
---
 src/man/sssd.conf.5.xml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index 
6eaaded33b326a812944f03f398c9b5e24e72128..31863ff66db911924105517664a6d5b0e92ebd3d
 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -2263,22 +2263,6 @@ subdomain_inherit = ldap_purge_cache_timeout
                         </para>
                     </listitem>
                 </varlistentry>
-                <varlistentry>
-                    <term>proxy_fast_alias (boolean)</term>
-                    <listitem>
-                        <para>
-                            When a user or group is looked up by name in
-                            the proxy provider, a second lookup by ID is
-                            performed to "canonicalize" the name in case
-                            the requested name was an alias. Setting this
-                            option to true would cause the SSSD to perform
-                            the ID lookup from cache for performance reasons.
-                        </para>
-                        <para>
-                            Default: false
-                        </para>
-                    </listitem>
-                </varlistentry>
 
                 <varlistentry>
                     <term>subdomain_homedir (string)</term>
@@ -2372,6 +2356,24 @@ subdomain_inherit = ldap_purge_cache_timeout
                         </para>
                     </listitem>
                 </varlistentry>
+
+                <varlistentry>
+                    <term>proxy_fast_alias (boolean)</term>
+                    <listitem>
+                        <para>
+                            When a user or group is looked up by name in
+                            the proxy provider, a second lookup by ID is
+                            performed to "canonicalize" the name in case
+                            the requested name was an alias. Setting this
+                            option to true would cause the SSSD to perform
+                            the ID lookup from cache for performance reasons.
+                        </para>
+                        <para>
+                            Default: false
+                        </para>
+                    </listitem>
+                </varlistentry>
+
             </variablelist>
         </para>
 
-- 
2.4.3

_______________________________________________
sssd-devel mailing list
[email protected]
https://lists.fedorahosted.org/admin/lists/[email protected]

Reply via email to