diff options
author | Thorsten Kukuk <kukuk@thkukuk.de> | 2015-03-25 15:00:38 +0100 |
---|---|---|
committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2015-03-25 15:00:38 +0100 |
commit | 10b83ef224a5e9c3e2663b3f08dd17090acc58ab (patch) | |
tree | 82a9a446b061cb90384bc195478e1383c83a53ee /doc/man | |
parent | 73bdfac8c091492f466342feb8f2f5daa2f4c39b (diff) | |
download | pam-10b83ef224a5e9c3e2663b3f08dd17090acc58ab.tar.gz pam-10b83ef224a5e9c3e2663b3f08dd17090acc58ab.tar.bz2 pam-10b83ef224a5e9c3e2663b3f08dd17090acc58ab.zip |
Support alternative "vendor configuration" files as fallback to /etc
(Ticket#34, patch from ay Sievers <kay@vrfy.org>)
* doc/man/pam.8.xml: document additonal config directory
* libpam/pam_handlers.c: add /usr/lib/pam.d as config file fallback directory
* libpam/pam_private.h: adjust defines
Diffstat (limited to 'doc/man')
-rw-r--r-- | doc/man/pam.8.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/man/pam.8.xml b/doc/man/pam.8.xml index 1267f01c..d36baae8 100644 --- a/doc/man/pam.8.xml +++ b/doc/man/pam.8.xml @@ -52,6 +52,14 @@ <filename>/etc/pam.conf</filename>. </para> + <para> + Vendor-supplied PAM configuration files might be installed in + the system directory <filename>/usr/lib/pam.d/</filename> instead + of the machine configuration directory <filename>/etc/pam.d/</filename>. + If no machine configuration file is found, the vendor-supplied file + is used. All files in <filename>/etc/pam.d/</filename> override + files with the same name in <filename>/usr/lib/pam.d/</filename>. + </para> <para>From the point of view of the system administrator, for whom this manual is provided, it is not of primary importance to understand the @@ -140,6 +148,16 @@ closing hook for modules to affect the services available to a user.</para> </para> </listitem> </varlistentry> + <varlistentry> + <term><filename>/usr/lib/pam.d</filename></term> + <listitem> + <para> + the <emphasis remap='B'>Linux-PAM</emphasis> vendor configuration + directory. Files in <filename>/etc/pam.d</filename> override + files with the same name in this directory. + </para> + </listitem> + </varlistentry> </variablelist> </refsect1> |