From 3fda983447d353248336d62373e246753507a365 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@redhat.com>
Date: Mon, 18 Oct 2010 09:10:58 +0200
Subject: Move all references to ldap_<entity>_search_base to "advanced"
 section

The <entity> can be one of user, group or netgroup. The references were removed
from example configuration and they were moved from section Configuration options
to section Advanced options.
Ticket: #607
---
 src/examples/sssd.conf  |  2 --
 src/man/sssd-ldap.5.xml | 94 +++++++++++++++++++++++++++----------------------
 2 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/src/examples/sssd.conf b/src/examples/sssd.conf
index 6a3640003..eaf70b88c 100644
--- a/src/examples/sssd.conf
+++ b/src/examples/sssd.conf
@@ -80,8 +80,6 @@ reconnection_retries = 3
 ; auth_provider = ldap
 ; ldap_uri = ldap://your.ad.server.com
 ; ldap_schema = rfc2307bis
-; ldap_user_search_base = cn=users,dc=example,dc=com
-; ldap_group_search_base = cn=users,dc=example,dc=com
 ; ldap_default_bind_dn = cn=Administrator,cn=Users,dc=example,dc=com
 ; ldap_default_authtok_type = password
 ; ldap_default_authtok = YOUR_PASSWORD
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
index ff6d4399b..87d388ade 100644
--- a/src/man/sssd-ldap.5.xml
+++ b/src/man/sssd-ldap.5.xml
@@ -146,20 +146,6 @@
                     </listitem>
                 </varlistentry>
 
-                <varlistentry>
-                    <term>ldap_user_search_base (string)</term>
-                    <listitem>
-                        <para>
-                            An optional base DN to restrict user searches
-                            to a specific subtree.
-                        </para>
-                        <para>
-                            Default: the value of
-                            <emphasis>ldap_search_base</emphasis>
-                        </para>
-                    </listitem>
-                </varlistentry>
-
                 <varlistentry>
                     <term>ldap_user_object_class (string)</term>
                     <listitem>
@@ -486,20 +472,6 @@
                     </listitem>
                 </varlistentry>
 
-                <varlistentry>
-                    <term>ldap_group_search_base (string)</term>
-                    <listitem>
-                        <para>
-                            An optional base DN to restrict group searches
-                            to a specific subtree.
-                        </para>
-                        <para>
-                            Default: the value of
-                            <emphasis>ldap_search_base</emphasis>
-                        </para>
-                    </listitem>
-                </varlistentry>
-
                 <varlistentry>
                     <term>ldap_group_object_class (string)</term>
                     <listitem>
@@ -593,20 +565,6 @@
                     </listitem>
                 </varlistentry>
 
-                <varlistentry>
-                    <term>ldap_netgroup_search_base (string)</term>
-                    <listitem>
-                        <para>
-                            An optional base DN to restrict netgroup searches
-                            to a specific subtree.
-                        </para>
-                        <para>
-                            Default: the value of
-                            <emphasis>ldap_search_base</emphasis>
-                        </para>
-                    </listitem>
-                </varlistentry>
-
                 <varlistentry>
                     <term>ldap_netgroup_object_class (string)</term>
                     <listitem>
@@ -1036,6 +994,58 @@ ldap_access_filter = memberOf=cn=allowedusers,ou=Groups,dc=example,dc=com
         </para>
     </refsect1>
 
+    <refsect1 id='advanced-options'>
+        <title>ADVANCED OPTIONS</title>
+        <para>
+            These options are supported by LDAP domains, but they should be used
+            with caution. Please include them in your configuration only if you
+            know what you are doing.
+            <variablelist>
+                <varlistentry>
+                    <term>ldap_netgroup_search_base (string)</term>
+                    <listitem>
+                        <para>
+                            An optional base DN to restrict netgroup searches
+                            to a specific subtree.
+                        </para>
+                        <para>
+                            Default: the value of
+                            <emphasis>ldap_search_base</emphasis>
+                        </para>
+                    </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                    <term>ldap_user_search_base (string)</term>
+                    <listitem>
+                        <para>
+                            An optional base DN to restrict user searches
+                            to a specific subtree.
+                        </para>
+                        <para>
+                            Default: the value of
+                            <emphasis>ldap_search_base</emphasis>
+                        </para>
+                    </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                    <term>ldap_group_search_base (string)</term>
+                    <listitem>
+                        <para>
+                            An optional base DN to restrict group searches
+                            to a specific subtree.
+                        </para>
+                        <para>
+                            Default: the value of
+                            <emphasis>ldap_search_base</emphasis>
+                        </para>
+                    </listitem>
+                </varlistentry>
+            </variablelist>
+        </para>
+    </refsect1>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/failover.xml" />
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/service_discovery.xml" />
-- 
cgit