diff options
| author | Günther Deschner <gdeschner@redhat.com> | 2014-04-07 12:10:34 +0200 |
|---|---|---|
| committer | Günther Deschner <gdeschner@redhat.com> | 2014-04-10 15:30:58 +0200 |
| commit | b3b6b780c8717d33db0e1665b285f01601614481 (patch) | |
| tree | 63b873d76f1eebbb1f3b338c8cc0178d17cbb3ad | |
| parent | 6a37db31c33399638545e59041d7d20941f4459f (diff) | |
| download | krb5-master-mechdconf.tar.gz krb5-master-mechdconf.tar.xz krb5-master-mechdconf.zip | |
Document reading of /etc/gss/mech.d/*.conf files.master-mechdconf
Signed-off-by: Günther Deschner <gdeschner@redhat.com>
| -rw-r--r-- | doc/admin/host_config.rst | 7 | ||||
| -rw-r--r-- | doc/plugindev/gssapi.rst | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/admin/host_config.rst b/doc/admin/host_config.rst index 755437cf6c..8a8813eac5 100644 --- a/doc/admin/host_config.rst +++ b/doc/admin/host_config.rst @@ -85,8 +85,11 @@ locator plugin would be registered by placing its shared object in GSSAPI mechanism modules ~~~~~~~~~~~~~~~~~~~~~~~~ -GSSAPI mechanism module are registered using the file -``/etc/gss/mech``. Each line in this file has the form:: +GSSAPI mechanism modules are registered using the file +``/etc/gss/mech`` or configuration files in the ``/etc/gss/mech.d/`` +directory. Files in the ``/etc/gss/mech.d/`` directory need to have +a ``.conf`` suffix in order to be used. Each line in these files has +the form:: oid pathname [options] <type> diff --git a/doc/plugindev/gssapi.rst b/doc/plugindev/gssapi.rst index bb5d6d16fd..a539ace1e3 100644 --- a/doc/plugindev/gssapi.rst +++ b/doc/plugindev/gssapi.rst @@ -9,8 +9,8 @@ the set of built-in mechanisms. A mechanism module is a Unix shared object or Windows DLL, built separately from the krb5 tree. Modules are loaded according to the -``/etc/gss/mech`` config file, as described in -:ref:`gssapi_plugin_config`. +``/etc/gss/mech`` or ``/etc/gss/mech.d/*.conf`` config files, as +described in :ref:`gssapi_plugin_config`. For the most part, a GSSAPI mechanism module exports the same functions as would a GSSAPI implementation itself, with the same @@ -45,7 +45,8 @@ with the following signature:: gss_OID_set gss_mech_interposer(gss_OID mech_type); This function is invoked with the OID of the interposer mechanism as -specified in ``/etc/gss/mech``, and returns a set of mechanism OIDs to +specified in ``/etc/gss/mech`` or in a ``/etc/gss/mech.d/*.conf`` file, +and returns a set of mechanism OIDs to be interposed. The returned OID set must have been created using the mechglue's gss_create_empty_oid_set and gss_add_oid_set_member functions. |