From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 30 Oct 2013 22:22:00 +0000 (-0400)
Subject: Clarify kpropd standalone mode documentation
X-Git-Tag: krb5-1.13-alpha1~330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfec0671ca6df811453d46a2f47afc7168b980fc;p=thirdparty%2Fkrb5.git

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

diff --git a/doc/admin/admin_commands/kpropd.rst b/doc/admin/admin_commands/kpropd.rst
index b5cebcc473..0bd0a02608 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