diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2008-12-02 15:13:43 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2008-12-02 15:13:43 +0000 |
| commit | d9719b48ab49957f5b983bfcfadf25d23e6674ed (patch) | |
| tree | 6e64640e39a5852001682bcabf10040088539fc1 /modules/pam_env/pam_env.8.xml | |
| parent | 7630ed2ce08055607206d25ba078cc081f1b12b7 (diff) | |
| download | pam-d9719b48ab49957f5b983bfcfadf25d23e6674ed.tar.gz pam-d9719b48ab49957f5b983bfcfadf25d23e6674ed.tar.bz2 pam-d9719b48ab49957f5b983bfcfadf25d23e6674ed.zip | |
Relevant BUGIDs:
Purpose of commit: new features
Commit summary:
---------------
2008-12-02 Thorsten Kukuk <kukuk@thkukuk.de>
* modules/pam_env/pam_env.c: Add support for user specific
environment file. Based on a patch from Ubuntu.
* modules/pam_env/pam_env.8.xml: Document new options.
Diffstat (limited to 'modules/pam_env/pam_env.8.xml')
| -rw-r--r-- | modules/pam_env/pam_env.8.xml | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/modules/pam_env/pam_env.8.xml b/modules/pam_env/pam_env.8.xml index 9e9a96a5..e8cd561b 100644 --- a/modules/pam_env/pam_env.8.xml +++ b/modules/pam_env/pam_env.8.xml @@ -34,6 +34,12 @@ <arg choice="opt"> readenv=<replaceable>0|1</replaceable> </arg> + <arg choice="opt"> + user_envfile=<replaceable>env-file</replaceable> + </arg> + <arg choice="opt"> + user_readenv=<replaceable>0|1</replaceable> + </arg> </cmdsynopsis> </refsynopsisdiv> @@ -115,6 +121,33 @@ </listitem> </varlistentry> + + <varlistentry> + <term> + <option>user_envfile=<replaceable>filename</replaceable></option> + </term> + <listitem> + <para> + Indicate an alternative <filename>.pam_environment</filename> + file to override the default. This can be useful when different + services need different environments. The filename is relativ to + the user home directory. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <option>user_readenv=<replaceable>0|1</replaceable></option> + </term> + <listitem> + <para> + Turns on or off the reading of the user specific environment + file. 0 is off, 1 is on. By default this option is on. + </para> + </listitem> + </varlistentry> + </variablelist> </refsect1> @@ -179,6 +212,12 @@ <para>Default environment file</para> </listitem> </varlistentry> + <varlistentry> + <term><filename>$HOME/.pam_environment</filename></term> + <listitem> + <para>User specific environment file</para> + </listitem> + </varlistentry> </variablelist> </refsect1> |