diff options
| author | Stefan Schubert <schubi@suse.de> | 2022-01-10 10:57:54 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2022-02-01 13:17:40 +0000 |
| commit | 5896ae50af24a5402eee3bdeb782fb5736daf3cb (patch) | |
| tree | 58b6eddc88940f639e5a2c355715d7bb27822407 /modules/pam_faillock/pam_faillock.8.xml | |
| parent | c11b0f5d8f9f6abcc76594af9e3b5e647b19f61f (diff) | |
| download | pam-5896ae50af24a5402eee3bdeb782fb5736daf3cb.tar.gz pam-5896ae50af24a5402eee3bdeb782fb5736daf3cb.tar.bz2 pam-5896ae50af24a5402eee3bdeb782fb5736daf3cb.zip | |
pam_faillock: use vendor specific faillock.conf as fallback
Use the vendor directory defined by --enable-vendordir=DIR configure
option as fallback for the distribution provided default config file
if there is no configuration in /etc.
* modules/pam_faillock/pam_faillock.8.xml: Describe this.
* modules/pam_faillock/faillock.h [VENDOR_SCONFIGDIR]
(VENDOR_FAILLOCK_DEFAULT_CONF): New macro.
* modules/pam_faillock/pam_faillock.c (read_config_file)
[VENDOR_FAILLOCK_DEFAULT_CONF]: Try to open VENDOR_FAILLOCK_DEFAULT_CONF
file when FAILLOCK_DEFAULT_CONF file does not exist.
Co-authored-by: Dmitry V. Levin <ldv@altlinux.org>
Resolves: https://github.com/linux-pam/linux-pam/pull/423
Diffstat (limited to 'modules/pam_faillock/pam_faillock.8.xml')
| -rw-r--r-- | modules/pam_faillock/pam_faillock.8.xml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/modules/pam_faillock/pam_faillock.8.xml b/modules/pam_faillock/pam_faillock.8.xml index 58c16442..79bcbbd0 100644 --- a/modules/pam_faillock/pam_faillock.8.xml +++ b/modules/pam_faillock/pam_faillock.8.xml @@ -134,10 +134,17 @@ <option>conf=/path/to/config-file</option> </term> <listitem> - <para> + <para condition="without_vendordir"> Use another configuration file instead of the default <filename>/etc/security/faillock.conf</filename>. </para> + <para condition="with_vendordir"> + Use another configuration file instead of the default + which is to use the file + <filename>/etc/security/faillock.conf</filename> or, + if that one is not present, the file + <filename>%vendordir%/security/faillock.conf</filename>. + </para> </listitem> </varlistentry> </variablelist> @@ -328,6 +335,15 @@ session required pam_selinux.so open <para>the config file for pam_faillock options</para> </listitem> </varlistentry> + <varlistentry condition="with_vendordir"> + <term><filename>%vendordir%/security/faillock.conf</filename></term> + <listitem> + <para> + the config file for pam_faillock options. It will be used if + <filename>/etc/security/faillock.conf</filename> does not exist. + </para> + </listitem> + </varlistentry> </variablelist> </refsect1> |