diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2020-08-11 14:54:35 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2020-08-11 15:00:33 -0700 |
| commit | 239d9c3181694bda5a0531ac579612c46c3b4e6d (patch) | |
| tree | 43c04725cde922627215f4c32665ea832dd456d1 /doc/man/PAM.8 | |
| parent | aa2142277bf5fb4a884c6119180e41258817705b (diff) | |
| parent | f6d08ed47a3da3c08345bce2ca366e961c52ad7c (diff) | |
| download | pam-239d9c3181694bda5a0531ac579612c46c3b4e6d.tar.gz pam-239d9c3181694bda5a0531ac579612c46c3b4e6d.tar.bz2 pam-239d9c3181694bda5a0531ac579612c46c3b4e6d.zip | |
Merge upstream version 1.4.0
Diffstat (limited to 'doc/man/PAM.8')
| -rw-r--r-- | doc/man/PAM.8 | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/doc/man/PAM.8 b/doc/man/PAM.8 index 09f223ed..c133f44b 100644 --- a/doc/man/PAM.8 +++ b/doc/man/PAM.8 @@ -1,13 +1,13 @@ '\" t .\" Title: pam .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 05/18/2018 +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Date: 06/08/2020 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" -.TH "PAM" "8" "05/18/2018" "Linux-PAM Manual" "Linux-PAM Manual" +.TH "PAM" "8" "06/08/2020" "Linux-PAM Manual" "Linux-PAM Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -49,15 +49,15 @@ configuration file directory\&. The presence of this directory will cause \fBLinux\-PAM\fR to -\fIignore\fR/etc/pam\&.conf\&. +\fIignore\fR +/etc/pam\&.conf\&. .PP Vendor\-supplied PAM configuration files might be installed in the system directory /usr/lib/pam\&.d/ -instead of the machine configuration directory +or a configurable vendor specific directory instead of the machine configuration directory /etc/pam\&.d/\&. If no machine configuration file is found, the vendor\-supplied file is used\&. All files in /etc/pam\&.d/ -override files with the same name in -/usr/lib/pam\&.d/\&. +override files with the same name in other directories\&. .PP From the point of view of the system administrator, for whom this manual is provided, it is not of primary importance to understand the internal behavior of the \fBLinux\-PAM\fR @@ -120,6 +120,17 @@ vendor configuration directory\&. Files in /etc/pam\&.d override files with the same name in this directory\&. .RE +.PP +<vendordir>/pam\&.d +.RS 4 +the +\fBLinux\-PAM\fR +vendor configuration directory\&. Files in +/etc/pam\&.d +and +/usr/lib/pam\&.d +override files with the same name in this directory\&. Only available if Linux\-PAM was compiled with vendordir enabled\&. +.RE .SH "ERRORS" .PP Typically errors generated by the |