diff options
| author | Thorsten Kukuk <5908016+thkukuk@users.noreply.github.com> | 2021-11-02 11:46:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 11:46:24 +0100 |
| commit | 04109c25a7dbd11404f7f23a9a405b9b9d6b7246 (patch) | |
| tree | 868531e48a6b1b0f332f30ae9c14dac74762b249 | |
| parent | 00a46bcead2857002ed720f22b558b6f6d349fc8 (diff) | |
| download | linux-pam-git-04109c25a7dbd11404f7f23a9a405b9b9d6b7246.tar.gz | |
Only include vendordir in manual page if set (#401)
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/man/pam.8.xml | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c06bc7dd..eb98d69a 100644 --- a/configure.ac +++ b/configure.ac @@ -507,9 +507,9 @@ AC_ARG_ENABLE([vendordir], if test -n "$enable_vendordir"; then AC_DEFINE_UNQUOTED([VENDORDIR], ["$enable_vendordir"], [Directory for distribution provided configuration files]) - STRINGPARAM_VENDORDIR="--stringparam vendordir '$enable_vendordir'" + STRINGPARAM_VENDORDIR="--stringparam vendordir '$enable_vendordir' --stringparam profile.condition 'with_vendordir'" else - STRINGPARAM_VENDORDIR="--stringparam vendordir '<vendordir>'" + STRINGPARAM_VENDORDIR="--stringparam profile.condition 'without_vendordir'" fi AC_SUBST([STRINGPARAM_VENDORDIR]) diff --git a/doc/man/pam.8.xml b/doc/man/pam.8.xml index 464af0e5..8eef665a 100644 --- a/doc/man/pam.8.xml +++ b/doc/man/pam.8.xml @@ -158,15 +158,14 @@ closing hook for modules to affect the services available to a user.</para> </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry condition="with_vendordir"> <term><filename>%vendordir%/pam.d</filename></term> <listitem> <para> the <emphasis remap='B'>Linux-PAM</emphasis> vendor configuration directory. Files in <filename>/etc/pam.d</filename> and <filename>/usr/lib/pam.d</filename> override files with the same - name in this directory. Only available if Linux-PAM was compiled - with vendordir enabled. + name in this directory. </para> </listitem> </varlistentry> |