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

diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
index 6636c2fc818961f68fe6fee8b2dc67f0c5ddaea3..e7ea0f209c38ebc70ddb385336270e4ca5348638 100644 (file)
--- 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 e85d54da0f103e78cd79e2f20fb9f81094269a40..0c146d3e31f7967c133ec0bc3f80caf275a08d61 100644 (file)
--- 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