52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
From 04109c25a7dbd11404f7f23a9a405b9b9d6b7246 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thorsten Kukuk <5908016+thkukuk@users.noreply.github.com>
|
||
|
|
Date: Tue, 2 Nov 2021 11:46:24 +0100
|
||
|
|
Subject: [PATCH 2/3] Only include vendordir in manual page if set (#401)
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 4 ++--
|
||
|
|
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>
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|