From 19e2efe81f7b80d4ce0dfc5fd80a06d56ae69e90 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 27 Aug 2012 22:15:17 +0200
Subject: autofs, sudo and ssh are not experimental anymore

---
 src/conf_macros.m4                    | 21 ---------------------
 src/man/sss_ssh_authorizedkeys.1.xml  |  3 ---
 src/man/sss_ssh_knownhostsproxy.1.xml |  3 ---
 src/man/sssd-ldap.5.xml               |  2 --
 src/man/sssd.conf.5.xml               | 17 -----------------
 5 files changed, 46 deletions(-)

(limited to 'src')

diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index 4dbbd7694..2e4e1141a 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -473,13 +473,6 @@ AC_DEFUN([WITH_SUDO],
                 [with_sudo=$withval],
                )
 
-    dnl Remove when sudo goes out of experimental
-    if test x"$enable_all_experimental_features" = xyes; then
-        if test x"$with_sudo" != xno; then
-            with_sudo=yes
-        fi
-    fi
-
     if test x"$with_sudo" = xyes; then
         AC_DEFINE(BUILD_SUDO, 1, [whether to build with SUDO support])
     fi
@@ -509,13 +502,6 @@ AC_DEFUN([WITH_AUTOFS],
                 [with_autofs=$withval],
                )
 
-    dnl Remove when autofs goes out of experimental
-    if test x"$enable_all_experimental_features" = xyes; then
-        if test x"$with_autofs" != xno; then
-            with_autofs=yes
-        fi
-    fi
-
     if test x"$with_autofs" = xyes; then
         AC_DEFINE(BUILD_AUTOFS, 1, [whether to build with AUTOFS support])
     fi
@@ -531,13 +517,6 @@ AC_DEFUN([WITH_SSH],
                 [with_ssh=$withval],
                )
 
-    dnl Remove when SSH goes out of experimental
-    if test x"$enable_all_experimental_features" = xyes; then
-        if test x"$with_ssh" != xno; then
-            with_ssh=yes
-        fi
-    fi
-
     if test x"$with_ssh" = xyes; then
         AC_DEFINE(BUILD_SSH, 1, [whether to build with SSH support])
     fi
diff --git a/src/man/sss_ssh_authorizedkeys.1.xml b/src/man/sss_ssh_authorizedkeys.1.xml
index ddf0e5856..aaafe56ad 100644
--- a/src/man/sss_ssh_authorizedkeys.1.xml
+++ b/src/man/sss_ssh_authorizedkeys.1.xml
@@ -69,9 +69,6 @@ AuthorizedKeysCommand /usr/bin/sss_ssh_authorizedkeys
 PubKeyAgent /usr/bin/sss_ssh_authorizedkeys %u
 </programlisting>
         </para>
-        <para>
-            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
-        </para>
     </refsect1>
 
     <refsect1 id='options'>
diff --git a/src/man/sss_ssh_knownhostsproxy.1.xml b/src/man/sss_ssh_knownhostsproxy.1.xml
index 37656f31e..7d14a709e 100644
--- a/src/man/sss_ssh_knownhostsproxy.1.xml
+++ b/src/man/sss_ssh_knownhostsproxy.1.xml
@@ -56,9 +56,6 @@ ProxyCommand /usr/bin/sss_ssh_knownhostsproxy -p %p %h
 GlobalKnownHostsFile /var/lib/sss/pubconf/known_hosts
 </programlisting>
         </para>
-        <para>
-            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
-        </para>
     </refsect1>
 
     <refsect1 id='options'>
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
index 02ec13488..843bca201 100644
--- a/src/man/sssd-ldap.5.xml
+++ b/src/man/sssd-ldap.5.xml
@@ -1762,7 +1762,6 @@ ldap_access_filter = memberOf=cn=allowedusers,ou=Groups,dc=example,dc=com
     <refsect1 id='sudo-options' condition="with_sudo">
         <title>SUDO OPTIONS</title>
         <para>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
             <variablelist>
                 <varlistentry>
                     <term>ldap_sudorule_object_class (string)</term>
@@ -2061,7 +2060,6 @@ ldap_access_filter = memberOf=cn=allowedusers,ou=Groups,dc=example,dc=com
             schema which is RFC2307.
         </para>
         <para>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
             <variablelist>
                 <varlistentry>
                     <term>ldap_autofs_map_object_class (string)</term>
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index bced7855d..4b29f228b 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -746,9 +746,6 @@ override_homedir = /home/%u
             <para>
                 These options can be used to configure the sudo service.
             </para>
-            <para>
-                <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
-            </para>
             <variablelist>
                 <varlistentry>
                     <term>sudo_timed (bool)</term>
@@ -771,10 +768,6 @@ override_homedir = /home/%u
             <para>
                 These options can be used to configure the autofs service.
             </para>
-            <para>
-                <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
-            </para>
-
             <variablelist>
                 <varlistentry>
                     <term>autofs_negative_timeout (integer)</term>
@@ -799,10 +792,6 @@ override_homedir = /home/%u
             <para>
                 These options can be used to configure the SSH service.
             </para>
-            <para>
-                <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
-            </para>
-
             <variablelist>
                 <varlistentry>
                     <term>ssh_hash_known_hosts (bool)</term>
@@ -1318,9 +1307,6 @@ override_homedir = /home/%u
                 <varlistentry condition="with_sudo">
                     <term>sudo_provider (string)</term>
                     <listitem>
-                        <para>
-                            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
-                        </para>
                         <para>
                             The SUDO provider used for the domain.
                             Supported SUDO providers are:
@@ -1395,9 +1381,6 @@ override_homedir = /home/%u
                 <varlistentry condition="with_autofs">
                     <term>autofs_provider (string)</term>
                     <listitem>
-                        <para>
-                            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/experimental.xml" />
-                        </para>
                         <para>
                             The autofs provider used for the domain.
                             Supported autofs providers are:
-- 
cgit