From: Greg Hudson Date: Thu, 23 Oct 2014 19:06:13 +0000 (-0400) Subject: Document multi-component profile paths X-Git-Tag: krb5-1.14-alpha1~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28dc817d2a065f5e0ab73377350a0529b2f4aa48;p=thirdparty%2Fkrb5.git Document multi-component profile paths In env_variables.rst and krb5_conf.rst, document that KRB5_CONFIG can contain multiple colon-separated pathnames. ticket: 8031 (new) target_version: 1.13.3 tags: pullup --- diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst index 3b51905e07..7fac36019c 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 e85d54da0f..0c146d3e31 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