diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2016-02-17 14:57:15 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2016-02-17 14:57:15 +0100 |
| commit | 51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5 (patch) | |
| tree | 6ceb7246f1afc43b815b7ad3c8d4ac379888e25d /modules/pam_env | |
| parent | 8bb171506fc2579669fd86bd29885f256e26ccb0 (diff) | |
| download | pam-51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5.tar.gz pam-51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5.tar.bz2 pam-51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5.zip | |
pam_env: Document the /etc/environment file.
* modules/pam_env/Makefile.am: Add the environment.5 soelim stub.
* modules/pam_env/pam_env.8.xml: Add environ(7) reference.
* modules/pam_env/pam_env.conf.5.xml: Add environment alias name.
Add a paragraph about /etc/environment. Add environ(7) reference.
Diffstat (limited to 'modules/pam_env')
| -rw-r--r-- | modules/pam_env/Makefile.am | 3 | ||||
| -rw-r--r-- | modules/pam_env/pam_env.8.xml | 3 | ||||
| -rw-r--r-- | modules/pam_env/pam_env.conf.5.xml | 14 |
3 files changed, 17 insertions, 3 deletions
diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am index 7b8d9afe..d6f081ff 100644 --- a/modules/pam_env/Makefile.am +++ b/modules/pam_env/Makefile.am @@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) tst-pam_env environment -man_MANS = pam_env.conf.5 pam_env.8 +man_MANS = pam_env.conf.5 pam_env.8 environment.5 XMLS = README.xml pam_env.conf.5.xml pam_env.8.xml @@ -30,6 +30,7 @@ sysconf_DATA = environment if ENABLE_REGENERATE_MAN noinst_DATA = README README: pam_env.8.xml pam_env.conf.5.xml +environment.5: pam_env.conf.5.xml -include $(top_srcdir)/Make.xml.rules endif diff --git a/modules/pam_env/pam_env.8.xml b/modules/pam_env/pam_env.8.xml index 6eac6c8d..d6e20a2e 100644 --- a/modules/pam_env/pam_env.8.xml +++ b/modules/pam_env/pam_env.8.xml @@ -247,6 +247,9 @@ </citerefentry>, <citerefentry> <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum> + </citerefentry>, + <citerefentry> + <refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum> </citerefentry>. </para> </refsect1> diff --git a/modules/pam_env/pam_env.conf.5.xml b/modules/pam_env/pam_env.conf.5.xml index 4040275a..c47f17d9 100644 --- a/modules/pam_env/pam_env.conf.5.xml +++ b/modules/pam_env/pam_env.conf.5.xml @@ -12,7 +12,8 @@ <refnamediv> <refname>pam_env.conf</refname> - <refpurpose>the environment variables config file</refpurpose> + <refname>environment</refname> + <refpurpose>the environment variables config files</refpurpose> </refnamediv> @@ -60,6 +61,14 @@ at front) can be used to mark this line as a comment line. </para> + <para> + The <filename>/etc/environment</filename> file specifies + the environment variables to be set. The file must consist of simple + <emphasis>NAME=VALUE</emphasis> pairs on separate lines. + The <citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry> + module will read the file after the <filename>pam_env.conf</filename> + file. + </para> </refsect1> <refsect1 id="pam_env.conf-examples"> @@ -113,7 +122,8 @@ <para> <citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry> + <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>, + <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry> </para> </refsect1> |