From e5f866de8f47b91f609a6bab0d0e002f1a826222 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Tue, 16 Apr 2019 11:11:19 -0400 Subject: [PATCH] Document default realm for krb5kdc Document that if no krb5kdc -r option is specified, the default realm is served. ticket: 8796 tags: pullup target_version: 1.17-next --- doc/admin/admin_commands/krb5kdc.rst | 4 +++- src/man/krb5kdc.man | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/admin/admin_commands/krb5kdc.rst b/doc/admin/admin_commands/krb5kdc.rst index 0342d0d189..a661ec4a76 100644 --- a/doc/admin/admin_commands/krb5kdc.rst +++ b/doc/admin/admin_commands/krb5kdc.rst @@ -31,7 +31,9 @@ OPTIONS ------- The **-r** *realm* option specifies the realm for which the server -should provide service. +should provide service. This option may be specified multiple times +to serve multiple realms. If no **-r** option is given, the default +realm (as specified in :ref:`krb5.conf(5)`) will be served. The **-d** *dbname* option specifies the name under which the principal database can be found. This option does not apply to the diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man index b573e64ac6..dfb9a14fd1 100644 --- a/src/man/krb5kdc.man +++ b/src/man/krb5kdc.man @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KRB5KDC" "8" " " "1.17" "MIT Kerberos" +.TH "KRB5KDC" "8" " " "1.18" "MIT Kerberos" .SH NAME krb5kdc \- Kerberos V5 KDC . @@ -51,7 +51,9 @@ Distribution Center (AS/KDC). .SH OPTIONS .sp The \fB\-r\fP \fIrealm\fP option specifies the realm for which the server -should provide service. +should provide service. This option may be specified multiple times +to serve multiple realms. If no \fB\-r\fP option is given, the default +realm (as specified in krb5.conf(5)) will be served. .sp The \fB\-d\fP \fIdbname\fP option specifies the name under which the principal database can be found. This option does not apply to the @@ -135,6 +137,6 @@ kdb5_ldap_util(8), kerberos(7) .SH AUTHOR MIT .SH COPYRIGHT -1985-2018, MIT +1985-2019, MIT .\" Generated by docutils manpage writer. . -- 2.47.2