From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 6 Jun 2019 15:35:36 +0000 (-0400)
Subject: Improve logging documentation
X-Git-Tag: krb5-1.17.1-final~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95c16b58ea5d0c58ad60cea1efad8a5ee41f878b;p=thirdparty%2Fkrb5.git

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
---

diff --git a/doc/admin/conf_files/kdc_conf.rst b/doc/admin/conf_files/kdc_conf.rst
index c73791ceb9..83d39c5397 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: