|
 |
71e593 |
From d6cc81b7f8b40575d146b2fa7d33c8a03c6253da Mon Sep 17 00:00:00 2001
|
|
|
71e593 |
From: Tomas Halman <thalman@redhat.com>
|
|
|
71e593 |
Date: Thu, 27 Sep 2018 16:03:40 +0200
|
|
|
71e593 |
Subject: [PATCH 28/28] doc: remove local provider reference from manpages
|
|
|
71e593 |
|
|
|
71e593 |
Introduce new condition for documentation build. Related part of
|
|
|
71e593 |
documentation is excluded, if build is done without local provider.
|
|
|
71e593 |
|
|
|
71e593 |
Resolves https://pagure.io/SSSD/sssd/issue/3826
|
|
|
71e593 |
|
|
|
71e593 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
71e593 |
(cherry picked from commit de8c9caf61e7b971cda9563cc5851ea222db5830)
|
|
|
71e593 |
---
|
|
|
71e593 |
src/man/Makefile.am | 6 +++++-
|
|
|
71e593 |
src/man/include/seealso.xml | 44 +++++++++++++++++++++++---------------------
|
|
|
71e593 |
src/man/sssd.conf.5.xml | 15 +++++++++------
|
|
|
71e593 |
3 files changed, 37 insertions(+), 28 deletions(-)
|
|
|
71e593 |
|
|
|
71e593 |
diff --git a/src/man/Makefile.am b/src/man/Makefile.am
|
|
|
71e593 |
index b4c20d8cf9574523c6d9c6aa631fe38979e54582..54a30d10f79eabf06353d6870da6ae38dcd980c1 100644
|
|
|
71e593 |
--- a/src/man/Makefile.am
|
|
|
71e593 |
+++ b/src/man/Makefile.am
|
|
|
71e593 |
@@ -51,7 +51,11 @@ CRYPTO_CONDS = ;with_nss
|
|
|
71e593 |
else
|
|
|
71e593 |
CRYPTO_CONDS = ;with_openssl
|
|
|
71e593 |
endif
|
|
|
71e593 |
-CONDS = with_false$(SUDO_CONDS)$(AUTOFS_CONDS)$(SSH_CONDS)$(PAC_RESPONDER_CONDS)$(IFP_CONDS)$(GPO_CONDS)$(SEC_CONDS)$(SYSTEMD_CONDS)$(FILES_CONDS)$(KCM_CONDS)$(STAP_CONDS)$(CRYPTO_CONDS)
|
|
|
71e593 |
+if BUILD_LOCAL_PROVIDER
|
|
|
71e593 |
+LOCAL_PROVIDER_CONDS = ;enable_local_provider
|
|
|
71e593 |
+endif
|
|
|
71e593 |
+
|
|
|
71e593 |
+CONDS = with_false$(SUDO_CONDS)$(AUTOFS_CONDS)$(SSH_CONDS)$(PAC_RESPONDER_CONDS)$(IFP_CONDS)$(GPO_CONDS)$(SEC_CONDS)$(SYSTEMD_CONDS)$(FILES_CONDS)$(KCM_CONDS)$(STAP_CONDS)$(CRYPTO_CONDS)$(LOCAL_PROVIDER_CONDS)
|
|
|
71e593 |
|
|
|
71e593 |
|
|
|
71e593 |
#Special Rules:
|
|
|
71e593 |
diff --git a/src/man/include/seealso.xml b/src/man/include/seealso.xml
|
|
|
71e593 |
index 52798e460e0a00ab436a4f4fa071cee104e1bb8b..f324b663717c44e8efdaae0409e28d04b9300ae7 100644
|
|
|
71e593 |
--- a/src/man/include/seealso.xml
|
|
|
71e593 |
+++ b/src/man/include/seealso.xml
|
|
|
71e593 |
@@ -44,27 +44,29 @@
|
|
|
71e593 |
<citerefentry>
|
|
|
71e593 |
<refentrytitle>sss_debuglevel</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
</citerefentry>,
|
|
|
71e593 |
- <citerefentry>
|
|
|
71e593 |
- <refentrytitle>sss_groupadd</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
- </citerefentry>,
|
|
|
71e593 |
- <citerefentry>
|
|
|
71e593 |
- <refentrytitle>sss_groupdel</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
- </citerefentry>,
|
|
|
71e593 |
- <citerefentry>
|
|
|
71e593 |
- <refentrytitle>sss_groupshow</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
- </citerefentry>,
|
|
|
71e593 |
- <citerefentry>
|
|
|
71e593 |
- <refentrytitle>sss_groupmod</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
- </citerefentry>,
|
|
|
71e593 |
- <citerefentry>
|
|
|
71e593 |
- <refentrytitle>sss_useradd</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
- </citerefentry>,
|
|
|
71e593 |
- <citerefentry>
|
|
|
71e593 |
- <refentrytitle>sss_userdel</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
- </citerefentry>,
|
|
|
71e593 |
- <citerefentry>
|
|
|
71e593 |
- <refentrytitle>sss_usermod</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
- </citerefentry>,
|
|
|
71e593 |
+ <phrase condition="enable_local_provider">
|
|
|
71e593 |
+ <citerefentry>
|
|
|
71e593 |
+ <refentrytitle>sss_groupadd</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
+ </citerefentry>,
|
|
|
71e593 |
+ <citerefentry>
|
|
|
71e593 |
+ <refentrytitle>sss_groupdel</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
+ </citerefentry>,
|
|
|
71e593 |
+ <citerefentry>
|
|
|
71e593 |
+ <refentrytitle>sss_groupshow</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
+ </citerefentry>,
|
|
|
71e593 |
+ <citerefentry>
|
|
|
71e593 |
+ <refentrytitle>sss_groupmod</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
+ </citerefentry>,
|
|
|
71e593 |
+ <citerefentry>
|
|
|
71e593 |
+ <refentrytitle>sss_useradd</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
+ </citerefentry>,
|
|
|
71e593 |
+ <citerefentry>
|
|
|
71e593 |
+ <refentrytitle>sss_userdel</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
+ </citerefentry>,
|
|
|
71e593 |
+ <citerefentry>
|
|
|
71e593 |
+ <refentrytitle>sss_usermod</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
+ </citerefentry>,
|
|
|
71e593 |
+ </phrase>
|
|
|
71e593 |
<citerefentry>
|
|
|
71e593 |
<refentrytitle>sss_obfuscate</refentrytitle><manvolnum>8</manvolnum>
|
|
|
71e593 |
</citerefentry>,
|
|
|
71e593 |
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
|
|
|
71e593 |
index 04143f199685b7703abe1b5bb82b6c33230e6c72..c1e38950f99cb8df4c59fe10866632030d3c6f25 100644
|
|
|
71e593 |
--- a/src/man/sssd.conf.5.xml
|
|
|
71e593 |
+++ b/src/man/sssd.conf.5.xml
|
|
|
71e593 |
@@ -2179,7 +2179,7 @@ pam_p11_allowed_services = +my_pam_service, -login
|
|
|
71e593 |
<para>
|
|
|
71e593 |
<quote>proxy</quote>: Support a legacy NSS provider.
|
|
|
71e593 |
</para>
|
|
|
71e593 |
- <para>
|
|
|
71e593 |
+ <para condition="enable_local_provider">
|
|
|
71e593 |
<quote>local</quote>: SSSD internal provider for
|
|
|
71e593 |
local users (DEPRECATED).
|
|
|
71e593 |
</para>
|
|
|
71e593 |
@@ -2324,7 +2324,7 @@ pam_p11_allowed_services = +my_pam_service, -login
|
|
|
71e593 |
<para>
|
|
|
71e593 |
<quote>proxy</quote> for relaying authentication to some other PAM target.
|
|
|
71e593 |
</para>
|
|
|
71e593 |
- <para>
|
|
|
71e593 |
+ <para condition="enable_local_provider">
|
|
|
71e593 |
<quote>local</quote>: SSSD internal provider for
|
|
|
71e593 |
local users
|
|
|
71e593 |
</para>
|
|
|
71e593 |
@@ -2836,9 +2836,12 @@ pam_p11_allowed_services = +my_pam_service, -login
|
|
|
71e593 |
<term>case_sensitive (string)</term>
|
|
|
71e593 |
<listitem>
|
|
|
71e593 |
<para>
|
|
|
71e593 |
- Treat user and group names as case sensitive. At
|
|
|
71e593 |
- the moment, this option is not supported in
|
|
|
71e593 |
- the local provider. Possible option values are:
|
|
|
71e593 |
+ Treat user and group names as case sensitive.
|
|
|
71e593 |
+ <phrase condition="enable_local_provider">
|
|
|
71e593 |
+ At the moment, this option is not supported in
|
|
|
71e593 |
+ the local provider.
|
|
|
71e593 |
+ </phrase>
|
|
|
71e593 |
+ Possible option values are:
|
|
|
71e593 |
<variablelist>
|
|
|
71e593 |
<varlistentry>
|
|
|
71e593 |
<term>True</term>
|
|
|
71e593 |
@@ -3148,7 +3151,7 @@ ldap_user_extra_attrs = phone:telephoneNumber
|
|
|
71e593 |
</programlisting>
|
|
|
71e593 |
</refsect2>
|
|
|
71e593 |
|
|
|
71e593 |
- <refsect2 id='local_domain'>
|
|
|
71e593 |
+ <refsect2 id='local_domain' condition="enable_local_provider">
|
|
|
71e593 |
<title>The local domain section</title>
|
|
|
71e593 |
<para>
|
|
|
71e593 |
This section contains settings for domain that stores users and
|
|
|
71e593 |
--
|
|
|
71e593 |
2.14.4
|