summaryrefslogtreecommitdiffstats
path: root/doc/admin/conf_files/index.rst
diff options
context:
space:
mode:
authorBen Kaduk <kaduk@mit.edu>2013-05-20 13:04:32 -0400
committerBen Kaduk <kaduk@mit.edu>2013-05-20 13:16:59 -0400
commite818d27a372d021bc6025e7bce867ed06a8fc1ad (patch)
treedf9395db83fea4006d5a02f8bc19edb3b0b6a259 /doc/admin/conf_files/index.rst
parenta505552a8d9d1c0e228236ae7f5f0422175f3b62 (diff)
downloadkrb5-e818d27a372d021bc6025e7bce867ed06a8fc1ad.tar.gz
krb5-e818d27a372d021bc6025e7bce867ed06a8fc1ad.tar.xz
krb5-e818d27a372d021bc6025e7bce867ed06a8fc1ad.zip
Clarify that kdc.conf and krb5.conf are merged
These two files are merged into the profile for KDC applications
Diffstat (limited to 'doc/admin/conf_files/index.rst')
-rw-r--r--doc/admin/conf_files/index.rst11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/admin/conf_files/index.rst b/doc/admin/conf_files/index.rst
index 078a173049..a04836ac74 100644
--- a/doc/admin/conf_files/index.rst
+++ b/doc/admin/conf_files/index.rst
@@ -1,6 +1,17 @@
Configuration Files
===================
+Kerberos uses configuration files to allow administrators to specify
+settings on a per-machine basis. :ref:`krb5.conf(5)` applies to all
+applications using the Kerboros library, on clients and servers.
+For KDC-specific applications, additional settings can be specified in
+:ref:`kdc.conf(5)`; the two files are merged into a configuration profile
+used by applications accessing the KDC database directly. :ref:`kadm5.acl(5)`
+is also only used on the KDC, it controls permissions for modifying the
+KDC database.
+
+Contents
+--------
.. toctree::
:maxdepth: 1