summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2019-05-05 19:32:21 -0400
committerGreg Hudson <ghudson@mit.edu>2019-12-09 17:02:52 -0500
commit1ce82d4b7fc6fb4277a2902d9cb3ca684ef477e2 (patch)
treee4a895b55237c1bbf59d02cf5d3af88160ad7fb5
parent5128986c9e1350cb66fa83939e03987c4d460321 (diff)
downloadkrb5-1ce82d4b7fc6fb4277a2902d9cb3ca684ef477e2.tar.gz
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. (cherry picked from commit 4ded6dbc23d27068567943bccf4d2d986b6f7d08) ticket: 8802 version_fixed: 1.17.1
-rw-r--r--doc/admin/admin_commands/kadmind.rst3
-rw-r--r--doc/admin/admin_commands/krb5kdc.rst4
-rw-r--r--src/man/kadmind.man5
-rw-r--r--src/man/krb5kdc.man4
4 files changed, 5 insertions, 11 deletions
diff --git a/doc/admin/admin_commands/kadmind.rst b/doc/admin/admin_commands/kadmind.rst
index 9e73ecef9..03a0d6d95 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 a661ec4a7..08d40cc0d 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 f8e61a821..f624b013f 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
diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index dfb9a14fd..062880c93 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