From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 5 May 2019 23:32:21 +0000 (-0400)
Subject: Remove outdated text in krb5kdc/kadmind man pages
X-Git-Tag: krb5-1.18-beta1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ded6dbc23d27068567943bccf4d2d986b6f7d08;p=thirdparty%2Fkrb5.git

Remove outdated text in krb5kdc/kadmind man pages

Some init systems, such as systemd, can run daemon processes in the
foreground, so admonishments to let krb5kdc and kadmind background
themselves in normal operation can be confusing.  Remove those
sentences.

ticket: 8802 (new)
tags: pullup
target_version: 1.17-next
---

diff --git a/doc/admin/admin_commands/kadmind.rst b/doc/admin/admin_commands/kadmind.rst
index 9e73ecef9e..03a0d6d955 100644
--- a/doc/admin/admin_commands/kadmind.rst
+++ b/doc/admin/admin_commands/kadmind.rst
@@ -74,8 +74,7 @@ OPTIONS
 
 **-nofork**
     causes the server to remain in the foreground and remain
-    associated to the terminal.  In normal operation, you should allow
-    the server to place itself in the background.
+    associated to the terminal.
 
 **-proponly**
     causes the server to only listen and respond to Kerberos replica
diff --git a/doc/admin/admin_commands/krb5kdc.rst b/doc/admin/admin_commands/krb5kdc.rst
index a661ec4a76..08d40cc0d8 100644
--- a/doc/admin/admin_commands/krb5kdc.rst
+++ b/doc/admin/admin_commands/krb5kdc.rst
@@ -50,9 +50,7 @@ The **-m** option specifies that the master database password should
 be fetched from the keyboard rather than from a stash file.
 
 The **-n** option specifies that the KDC does not put itself in the
-background and does not disassociate itself from the terminal.  In
-normal operation, you should always allow the KDC to place itself in
-the background.
+background and does not disassociate itself from the terminal.
 
 The **-P** *pid_file* option tells the KDC to write its PID into
 *pid_file* after it starts up.  This can be used to identify whether
diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index 4b6410e8f8..f624b013f1 100644
--- a/src/man/kadmind.man
+++ b/src/man/kadmind.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIND" "8" " " "1.17" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.18" "MIT Kerberos"
 .SH NAME
 kadmind \- KADM5 administration server
 .
@@ -98,8 +98,7 @@ disk.
 .TP
 \fB\-nofork\fP
 causes the server to remain in the foreground and remain
-associated to the terminal.  In normal operation, you should allow
-the server to place itself in the background.
+associated to the terminal.
 .TP
 \fB\-proponly\fP
 causes the server to only listen and respond to Kerberos replica
@@ -149,6 +148,6 @@ kdb5_ldap_util(8), kadm5.acl(5), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2019, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index dfb9a14fd1..062880c939 100644
--- a/src/man/krb5kdc.man
+++ b/src/man/krb5kdc.man
@@ -70,9 +70,7 @@ The \fB\-m\fP option specifies that the master database password should
 be fetched from the keyboard rather than from a stash file.
 .sp
 The \fB\-n\fP option specifies that the KDC does not put itself in the
-background and does not disassociate itself from the terminal.  In
-normal operation, you should always allow the KDC to place itself in
-the background.
+background and does not disassociate itself from the terminal.
 .sp
 The \fB\-P\fP \fIpid_file\fP option tells the KDC to write its PID into
 \fIpid_file\fP after it starts up.  This can be used to identify whether