From d6cc81b7f8b40575d146b2fa7d33c8a03c6253da Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Thu, 27 Sep 2018 16:03:40 +0200 Subject: [PATCH 28/28] doc: remove local provider reference from manpages Introduce new condition for documentation build. Related part of documentation is excluded, if build is done without local provider. Resolves https://pagure.io/SSSD/sssd/issue/3826 Reviewed-by: Jakub Hrozek (cherry picked from commit de8c9caf61e7b971cda9563cc5851ea222db5830) --- src/man/Makefile.am | 6 +++++- src/man/include/seealso.xml | 44 +++++++++++++++++++++++--------------------- src/man/sssd.conf.5.xml | 15 +++++++++------ 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/man/Makefile.am b/src/man/Makefile.am index b4c20d8cf9574523c6d9c6aa631fe38979e54582..54a30d10f79eabf06353d6870da6ae38dcd980c1 100644 --- a/src/man/Makefile.am +++ b/src/man/Makefile.am @@ -51,7 +51,11 @@ CRYPTO_CONDS = ;with_nss else CRYPTO_CONDS = ;with_openssl endif -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) +if BUILD_LOCAL_PROVIDER +LOCAL_PROVIDER_CONDS = ;enable_local_provider +endif + +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) #Special Rules: diff --git a/src/man/include/seealso.xml b/src/man/include/seealso.xml index 52798e460e0a00ab436a4f4fa071cee104e1bb8b..f324b663717c44e8efdaae0409e28d04b9300ae7 100644 --- a/src/man/include/seealso.xml +++ b/src/man/include/seealso.xml @@ -44,27 +44,29 @@ sss_debuglevel8 , - - sss_groupadd8 - , - - sss_groupdel8 - , - - sss_groupshow8 - , - - sss_groupmod8 - , - - sss_useradd8 - , - - sss_userdel8 - , - - sss_usermod8 - , + + + sss_groupadd8 + , + + sss_groupdel8 + , + + sss_groupshow8 + , + + sss_groupmod8 + , + + sss_useradd8 + , + + sss_userdel8 + , + + sss_usermod8 + , + sss_obfuscate8 , diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml index 04143f199685b7703abe1b5bb82b6c33230e6c72..c1e38950f99cb8df4c59fe10866632030d3c6f25 100644 --- a/src/man/sssd.conf.5.xml +++ b/src/man/sssd.conf.5.xml @@ -2179,7 +2179,7 @@ pam_p11_allowed_services = +my_pam_service, -login proxy: Support a legacy NSS provider. - + local: SSSD internal provider for local users (DEPRECATED). @@ -2324,7 +2324,7 @@ pam_p11_allowed_services = +my_pam_service, -login proxy for relaying authentication to some other PAM target. - + local: SSSD internal provider for local users @@ -2836,9 +2836,12 @@ pam_p11_allowed_services = +my_pam_service, -login case_sensitive (string) - Treat user and group names as case sensitive. At - the moment, this option is not supported in - the local provider. Possible option values are: + Treat user and group names as case sensitive. + + At the moment, this option is not supported in + the local provider. + + Possible option values are: True @@ -3148,7 +3151,7 @@ ldap_user_extra_attrs = phone:telephoneNumber - + The local domain section This section contains settings for domain that stores users and -- 2.14.4