diff options
| author | Tomas Mraz <tm@t8m.info> | 2007-03-29 20:33:07 +0000 |
|---|---|---|
| committer | Tomas Mraz <tm@t8m.info> | 2007-03-29 20:33:07 +0000 |
| commit | f6b973b922818f189bdb70924de0c6691cf9ffe4 (patch) | |
| tree | a2827d4f746f0c91a4ab740013b66ddc660bfb45 /modules/pam_limits/pam_limits.8.xml | |
| parent | e2546c9b5832a738be84e5882c1804ff3b05c569 (diff) | |
| download | pam-f6b973b922818f189bdb70924de0c6691cf9ffe4.tar.gz pam-f6b973b922818f189bdb70924de0c6691cf9ffe4.tar.bz2 pam-f6b973b922818f189bdb70924de0c6691cf9ffe4.zip | |
Relevant BUGIDs:
Purpose of commit: new feature
Commit summary:
---------------
* modules/pam_limits/Makefile.am: Define limits.d dir and install it.
* modules/pam_limits/pam_limits.8.xml: Describe limits.d parsing.
* modules/pam_limits/pam_limits.c (pam_limit_s): Make conf_file ptr.
(pam_parse): conf_file is now ptr.
(pam_sm_open_session): Add parsing files from limits.d subdir using
glob, change pl to pointer.
Diffstat (limited to 'modules/pam_limits/pam_limits.8.xml')
| -rw-r--r-- | modules/pam_limits/pam_limits.8.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/modules/pam_limits/pam_limits.8.xml b/modules/pam_limits/pam_limits.8.xml index 78060a20..9f13bb68 100644 --- a/modules/pam_limits/pam_limits.8.xml +++ b/modules/pam_limits/pam_limits.8.xml @@ -47,7 +47,15 @@ </para> <para> By default limits are taken from the <filename>/etc/security/limits.conf</filename> - config file. + config file. Then individual files from the <filename>/etc/security/limits.d/</filename> + directory are read. The files are parsed one after another in the order of "C" locale. + The effect of the individual files is the same as if all the files were + concatenated together in the order of parsing. + If a config file is explicitely specified with a module option then the + files in the above directory are not parsed. + </para> + <para> + The module must not be called by a multithreaded application. </para> </refsect1> |