Documented kdc_ports, and removed references to primary_port and

secondary_port, which are no longer used.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6941 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog
index 6b89ae66d181bcb53b41cb2fc0280803bf653056..28d8241bb82d8df0dbbb5696efa17df5d181a58f 100644 (file)
--- a/src/config-files/ChangeLog
+++ b/src/config-files/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  5 22:38:24 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * kdc.conf.M: Documented kdc_ports, and removed references to
+               primary_port and secondary_port, which are no longer used.
+
 Wed Sep 13 18:40:24 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * kdc.conf.M (profile): Remove definition of the profile field,

diff --git a/src/config-files/kdc.conf b/src/config-files/kdc.conf
index 25928d168cda80175e38fb78aa3e94d5ff1b2c72..4b7457987832c11ea0cff5d6a13ec1e7345eeef1 100644 (file)
--- a/src/config-files/kdc.conf
+++ b/src/config-files/kdc.conf
@@ -1,14 +1,12 @@
 [kdcdefaults]
-       primary_ports = 750
-       secondary_ports = 88
+       kdc_ports = 750,88
 
 [realms]
        ATHENA.MIT.EDU = {
                profile = /etc/krb5.conf
                database_name = /usr/local/lib/krb5kdc/principal
                key_stash_file = /usr/local/lib/krb5kdc/stash
-               port = 750
-               secondary_port = 88
+               kdc_ports = 750,88
                max_life = 8h 0m 0s
                max_renewable_life = 7d 0h 0m 0s
        }

diff --git a/src/config-files/kdc.conf.M b/src/config-files/kdc.conf.M
index 3273c4328b17e0660fbc966f51ce4d3677d27084..b268edb42f3273027c3b3b5ead035f756dc38514 100644 (file)
--- a/src/config-files/kdc.conf.M
+++ b/src/config-files/kdc.conf.M
@@ -45,36 +45,11 @@ KDC parameters.
 The following relations are defined in the
 .I [kdcdefaults]
 section:
-.IP primary_ports
-This relation lists the primary ports (e.g. ports to serve Kerberos version
-5 requests) to listen on.  This list is a comma separated list of integers.
-If supplied, this list serves as a base list of ports to listen on.  If any
-other ports are named in the
-.I [realms]
-section explicitly; or are named by
-.B kdc
-relations specifying this host in the
-.I krb5.conf
-file specified in the
-.B profile
-entry for a particular realm, then these ports are also listened on.
-.IP secondary_ports
-This relation lists the secondary ports (e.g. ports to serve Kerberos version
-4 requests) to listen on.  If supplied, this list serves as a base list of
-ports to listen on.  If any other ports are named in the
-.I [realms]
-section explicitly; or are named by
-.B v4kdc
-relations specifying this host in the
-.I krb5.conf
-file specified in the
-.B profile
-entry for a particular realm, then these ports are also listened on.
-Further, if this list is specified and the first element is
-.I \-1
-then no secondary ports are listened to, even if specified in the
-.I [realms]
-section.
+.IP kdc_ports
+This relation lists the ports which the Kerberos server should listen
+on, by default.  This list is a comma separated list of integers.  If
+this relation is not specified, the compiled-in default is usually
+port 88 and port 750.
 .SH REALMS SECTION
 Each tag in the
 .I [realms]
@@ -111,17 +86,15 @@ This
 specifies the location where the master key has been stored with
 .I kdb5_stash.
 
-.IP port
+.IP kdc_ports
 This
-.B integer
-specifies the primary port that the KDC is to listen to for this
-realm.
-
-.IP secondary_port
-This
-.B integer
-specifies the secondary port that the KDC is to listen to for this
-realm.
+.B string
+specifies the list of ports that the KDC is to listen to for this realm.  
+By default, the value of 
+.I kdc_ports
+as specified in the 
+.I [kdcdefaults] 
+section is used.
 
 .IP max_life
 This