diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-10-23 15:06:13 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2015-08-18 16:57:15 -0400 |
| commit | d170ed6e57e5d3ebe0cf158b1bb6782bbcd74798 (patch) | |
| tree | a65173e2cb513b99a9f1897590be71b2755b1b64 /doc | |
| parent | fd58e67b5778642dc882c3f5a256f0cbff669a0e (diff) | |
| download | krb5-d170ed6e57e5d3ebe0cf158b1bb6782bbcd74798.zip krb5-d170ed6e57e5d3ebe0cf158b1bb6782bbcd74798.tar.gz krb5-d170ed6e57e5d3ebe0cf158b1bb6782bbcd74798.tar.bz2 | |
Document multi-component profile paths
In env_variables.rst and krb5_conf.rst, document that KRB5_CONFIG can
contain multiple colon-separated pathnames.
(cherry picked from commit 28dc817d2a065f5e0ab73377350a0529b2f4aa48)
ticket: 8031
version_fixed: 1.13.3
status: resolved
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/admin/conf_files/krb5_conf.rst | 4 | ||||
| -rw-r--r-- | doc/admin/env_variables.rst | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst index 6636c2f..e7ea0f2 100644 --- a/doc/admin/conf_files/krb5_conf.rst +++ b/doc/admin/conf_files/krb5_conf.rst @@ -9,7 +9,9 @@ realms of interest, defaults for the current realm and for Kerberos applications, and mappings of hostnames onto Kerberos realms. Normally, you should install your krb5.conf file in the directory ``/etc``. You can override the default location by setting the -environment variable **KRB5_CONFIG**. +environment variable **KRB5_CONFIG**. Multiple colon-separated +filenames may be specified in **KRB5_CONFIG**; all files which are +present will be read. Structure diff --git a/doc/admin/env_variables.rst b/doc/admin/env_variables.rst index e85d54d..0c146d3 100644 --- a/doc/admin/env_variables.rst +++ b/doc/admin/env_variables.rst @@ -4,8 +4,9 @@ Environment variables The following environment variables can be used during runtime: **KRB5_CONFIG** - Main Kerberos configuration file. (See :ref:`mitK5defaults` for - the default name.) + Main Kerberos configuration file. Multiple filenames can be + specified, separated by a colon; all files which are present will + be read. (See :ref:`mitK5defaults` for the default path.) **KRB5_KDC_PROFILE** KDC configuration file. (See :ref:`mitK5defaults` for the default |