aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2019-06-06 11:35:36 -0400
committerGreg Hudson <ghudson@mit.edu>2019-12-09 17:02:52 -0500
commit95c16b58ea5d0c58ad60cea1efad8a5ee41f878b (patch)
tree04bf28bb89893f588774e3213fced961e5031e3b
parented33a70c32f14cfe4cbbf3f490842b1fd1ef57f0 (diff)
downloadkrb5-95c16b58ea5d0c58ad60cea1efad8a5ee41f878b.zip
krb5-95c16b58ea5d0c58ad60cea1efad8a5ee41f878b.tar.gz
krb5-95c16b58ea5d0c58ad60cea1efad8a5ee41f878b.tar.bz2
Improve logging documentation
The default severity was removed by commit 6ce8fd4cfa2e9b1e92debd204a5b2ddf053cca55 (ticket 8630) but the example still talks about it; remove that text. Add a note about the default being syslog if nothing else is specified, and a note on how to disable logging. (cherry picked from commit 4dabc3d0bcdcdcd5aad070b97a27141a3abd0bbd) ticket: 8813 version_fixed: 1.17.1
-rw-r--r--doc/admin/conf_files/kdc_conf.rst11
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/admin/conf_files/kdc_conf.rst b/doc/admin/conf_files/kdc_conf.rst
index c73791c..83d39c5 100644
--- a/doc/admin/conf_files/kdc_conf.rst
+++ b/doc/admin/conf_files/kdc_conf.rst
@@ -649,10 +649,10 @@ Logging specifications may have the following forms:
facility is specified, the default is **AUTH**.
In the following example, the logging messages from the KDC will go to
-the console and to the system log under the facility LOG_DAEMON with
-default severity of LOG_INFO; and the logging messages from the
-administrative server will be appended to the file
-``/var/adm/kadmin.log`` and sent to the device ``/dev/tty04``. ::
+the console and to the system log under the facility LOG_DAEMON, and
+the logging messages from the administrative server will be appended
+to the file ``/var/adm/kadmin.log`` and sent to the device
+``/dev/tty04``. ::
[logging]
kdc = CONSOLE
@@ -660,6 +660,9 @@ administrative server will be appended to the file
admin_server = FILE:/var/adm/kadmin.log
admin_server = DEVICE=/dev/tty04
+If no logging specification is given, the default is to use syslog.
+To disable logging entirely, specify ``default = DEVICE=/dev/null``.
+
.. _otp: