diff options
author | Zhanna Tsitkov <tsitkova@mit.edu> | 2012-11-29 14:01:00 -0500 |
---|---|---|
committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2012-11-29 14:05:19 -0500 |
commit | 59be40c78b0895ebc00a6400d129a4b3c7fd258b (patch) | |
tree | 74ede98307cd666ce68a27a7df00fec4612d6cd6 | |
parent | 4a3348582f948c36473512d59b9c9b7c247602f0 (diff) | |
download | krb5-59be40c78b0895ebc00a6400d129a4b3c7fd258b.tar.gz krb5-59be40c78b0895ebc00a6400d129a4b3c7fd258b.tar.xz krb5-59be40c78b0895ebc00a6400d129a4b3c7fd258b.zip |
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
-rw-r--r-- | doc/admin/conf_files/krb5_conf.rst | 5 | ||||
-rw-r--r-- | doc/build/options2configure.rst | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst index 451532eeb2..5dbbfa49b4 100644 --- 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 211df7ea8d..a88f032946 100644 --- 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 |