Document param expansion for keytab/ccache names

The DEFCCNAME, DEFCKTNAME and DEFKTNAME configuration options are
subjects to parameter expansion.  Also note that this feature
was first introduced in release 1.11.

ticket: 7472
tags: pullup
target_version: 1.11

diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
index 451532eeb2926050c8e56c66859f72cbba3c294c..5dbbfa49b415714021cd130901b3a4267550863c 100644 (file)
--- a/doc/admin/conf_files/krb5_conf.rst
+++ b/doc/admin/conf_files/krb5_conf.rst
@@ -981,8 +981,9 @@ PKINIT krb5.conf options
 Parameter expansion
 -------------------
 
-Several variables, such as **default_keytab_name**, allow parameters
-to be expanded.  Valid parameters are:
+Starting with release 1.11, several variables, such as
+**default_keytab_name**, allow parameters to be expanded.
+Valid parameters are:
 
     =================  ===================================================
     %{TEMP}            Temporary directory

diff --git a/doc/build/options2configure.rst b/doc/build/options2configure.rst
index 211df7ea8d7a276ab6b1c8273137e7bc03f2bb7a..a88f032946d303eda8916fe3534882a888f83cee 100644 (file)
--- a/doc/build/options2configure.rst
+++ b/doc/build/options2configure.rst
@@ -48,8 +48,7 @@ Most commonly used options
 **-**\ **-enable-dns-for-realm**
     Enable the use of DNS to look up a host's Kerberos realm,
     if the information is not provided in
-    :ref:`krb5.conf(5)`.  See
-    :ref:`mapping_hostnames`
+    :ref:`krb5.conf(5)`.  See :ref:`mapping_hostnames`
     for information about using DNS to determine the default realm.
     DNS lookups for realm names are disabled by default.
 
@@ -120,12 +119,17 @@ Environment variables
 
 **DEFCCNAME=**\ *ccachename*
     Override the built-in default credential cache name.
+    For example, ``DEFCCNAME=DIR:/var/run/user/%{USERID}/ccache``
+    See :ref:`parameter_expansion` for information about supported
+    parameter expansions.
 
 **DEFCKTNAME=**\ *keytabname*
     Override the built-in default client keytab name.
+    The format is the same as for *DEFCCNAME*.
 
 **DEFKTNAME=**\ *keytabname*
     Override the built-in default keytab name.
+    The format is the same as for *DEFCCNAME*.
 
 **LD=**\ *LINKER*
     Use *LINKER* as the default loader if it should be different from