diff options
| author | Günther Deschner <gdeschner@redhat.com> | 2014-04-07 12:10:34 +0200 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-05-22 17:54:10 -0400 |
| commit | 406f273e373014edc0ec31995dc82d6b7a5d73f8 (patch) | |
| tree | 9dcf5733ff8b5f36b9a677e50f95a88a05ea3804 /doc | |
| parent | 05cbef80d53f49d30a5d0563501226dc173734d4 (diff) | |
Document /etc/gss/mech.d/*.conf
[ghudson@mit.edu: editorial changes]
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/admin/host_config.rst | 7 | ||||
| -rw-r--r-- | doc/plugindev/gssapi.rst | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/doc/admin/host_config.rst b/doc/admin/host_config.rst index 755437cf6..2ac12adbe 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. Only files with a ``.conf`` suffix will be read from the +``/etc/gss/mech.d/`` directory. 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 bb5d6d16f..34fc9e484 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,10 +45,10 @@ 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 -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. +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. An interposer module must use the prefix ``gssi_`` for the GSSAPI functions it exports, instead of the prefix ``gss_``. |