summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-07-20 19:14:38 +0000
committerGreg Hudson <ghudson@mit.edu>2011-07-20 19:14:38 +0000
commit510f82a3dfdca65a7c9cd145739cd115d6edcdf0 (patch)
treed6993f8c4a10ef1edcc5e0adef048b27db7a2ae5
parentf2004cdbca0cb79dc15ad3b91fc375c1dd687608 (diff)
downloadkrb5-510f82a3dfdca65a7c9cd145739cd115d6edcdf0.tar.gz
krb5-510f82a3dfdca65a7c9cd145739cd115d6edcdf0.tar.xz
krb5-510f82a3dfdca65a7c9cd145739cd115d6edcdf0.zip
Document loadable profile modules
ticket: 6929 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25027 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--doc/rst_source/krb_admins/conf_files/krb5_conf.rst6
-rw-r--r--src/config-files/krb5.conf.M12
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/rst_source/krb_admins/conf_files/krb5_conf.rst b/doc/rst_source/krb_admins/conf_files/krb5_conf.rst
index 53e7fd924..41de7e107 100644
--- a/doc/rst_source/krb_admins/conf_files/krb5_conf.rst
+++ b/doc/rst_source/krb_admins/conf_files/krb5_conf.rst
@@ -39,6 +39,12 @@ The krb5.conf file can include other files using either of the following directi
*FILENAME* or *DIRNAME* should be an absolute path. The named file or directory must exist and be readable. Including a directory includes all files within the directory whose names consist solely of alphanumeric characters, dashes, or underscores. Included profile files are syntactically independent of their parents, so each included file must begin with a section header.
+The krb5.conf file can specify that configuration should be obtained from a loadable module, rather than the file itself, using the following directive at the beginning of a line before any section headers::
+
+ module MODULEPATH:RESIDUAL
+
+*MODULEPATH* may be relative to the library path of the krb5 installation, or it may be an absolute path. *RESIDUAL* is provided to the module at initialization time. If krb5.conf uses a module directive, kdc.conf should also use one if it exists.
+
The krb5.conf file may contain any or all of the following sections:
============== =======================================================
diff --git a/src/config-files/krb5.conf.M b/src/config-files/krb5.conf.M
index d29bd2b7f..70239e210 100644
--- a/src/config-files/krb5.conf.M
+++ b/src/config-files/krb5.conf.M
@@ -71,6 +71,18 @@ files are syntactically independent of their parents, so each included
file must begin with a section header.
.PP
+.I krb5.conf
+can cause configuration to be obtained from a loadable profile module
+by placing the directive "module MODULEPATH:RESIDUAL" at the beginning
+of a line before any section headers. MODULEPATH may be relative to
+the library path of the krb5 installation, or it may be an absolute
+path. RESIDUAL is provided to the module at initialization time. If
+.I krb5.conf
+uses a module directive,
+.I kdc.conf
+should also use one if it exists.
+
+.PP
The following sections are currently used in the
.I krb5.conf
file: