summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-10-30 18:22:00 -0400
committerGreg Hudson <ghudson@mit.edu>2013-11-01 10:55:39 -0400
commitbfec0671ca6df811453d46a2f47afc7168b980fc (patch)
tree519a9f273c9c170e4587454de1be9ef7915a1c7f
parente4b5d426a1e1e00367cc44a9619535ab71b20393 (diff)
downloadkrb5-bfec0671ca6df811453d46a2f47afc7168b980fc.tar.gz
krb5-bfec0671ca6df811453d46a2f47afc7168b980fc.tar.xz
krb5-bfec0671ca6df811453d46a2f47afc7168b980fc.zip
Clarify kpropd standalone mode documentation
The kpropd -S option is no longer needed to run kpropd in standalone mode, but its functionality is not deprecated; standalone mode is automatically activated when appropriate. Clarify the kpropd documentation on standalone mode to avoid giving the impression that the mode is deprecated. ticket: 7751 (new) target_version: 1.12 tags: pullup
-rw-r--r--doc/admin/admin_commands/kpropd.rst27
1 files changed, 12 insertions, 15 deletions
diff --git a/doc/admin/admin_commands/kpropd.rst b/doc/admin/admin_commands/kpropd.rst
index b5cebcc47..0bd0a0260 100644
--- a/doc/admin/admin_commands/kpropd.rst
+++ b/doc/admin/admin_commands/kpropd.rst
@@ -39,9 +39,14 @@ the ``/etc/inetd.conf`` file which looks like this:
kprop stream tcp nowait root /usr/local/sbin/kpropd kpropd
-kpropd can also run as a standalone daemon. This is required for
-incremental propagation. But this is also useful for debugging
-purposes.
+kpropd can also run as a standalone daemon, backgrounding itself and
+waiting for connections on port 754 (or the port specified with the
+**-P** option if given). Standalone mode is required for incremental
+propagation. Starting in release 1.11, kpropd automatically detects
+whether it was run from inetd and runs in standalone mode if it is
+not. Prior to release 1.11, the **-S** option is required to run
+kpropd in standalone mode; this option is now accepted for backward
+compatibility but does nothing.
Incremental propagation may be enabled with the **iprop_enable**
variable in :ref:`kdc.conf(5)`. If incremental propagation is
@@ -75,19 +80,11 @@ OPTIONS
program; by default the pathname used is |sbindir|\
``/kdb5_util``.
-**-S**
- [DEPRECATED] Enable standalone mode. Normally kpropd is invoked by
- inetd(8) so it expects a network connection to be passed to it
- from inetd(8). If the **-S** option is specified, or if standard
- input is not a socket, kpropd will put itself into the background,
- and wait for connections on port 754 (or the port specified with the
- **-P** option if given).
-
**-d**
- Turn on debug mode. In this mode, if the **-S** option is
- selected, kpropd will not detach itself from the current job and
- run in the background. Instead, it will run in the foreground and
- print out debugging messages during the database propagation.
+ Turn on debug mode. In this mode, kpropd will not detach
+ itself from the current job and run in the background. Instead,
+ it will run in the foreground and print out debugging messages
+ during the database propagation.
**-P**
Allow for an alternate port number for kpropd to listen on. This