Document loadable profile modules

ticket: 6929

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25027 dc483132-0cff-0310-8789-dd5450dbe970

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 53e7fd92457cf38e05ad3b7486beb4662b3f2387..41de7e1078f5a6716bb08a414394569752611a01 100644 (file)
--- 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 d29bd2b7f5e325d25d3aca9384847449e2934156..70239e210d4f339e28ea5f146c7382a9f1c4625a 100644 (file)
--- a/src/config-files/krb5.conf.M
+++ b/src/config-files/krb5.conf.M
@@ -70,6 +70,18 @@ alphanumeric characters, dashes, or underscores.  Included profile
 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