pull up r19139 from trunk

 r19139@cathode-dark-space:  rra | 2007-02-03 13:33:23 -0500
 Ticket: 2724
 Component: krb5-doc
 Target_Version: 1.6.1
 Tags: pullup

 The default K4 compatibility mode is now none, not preauth.  Also document
 that the valid values for v4_mode are the valid arguments to the -4 flag
 to krb5kdc.

ticket: 2724
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19188 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config-files/kdc.conf.M b/src/config-files/kdc.conf.M
index 0c1735f3c76fce33abfe12087005dcb866c2dd89..f19c6e00836a7f31ebe919e67843865c57f35b34 100644 (file)
--- a/src/config-files/kdc.conf.M
+++ b/src/config-files/kdc.conf.M
@@ -57,9 +57,13 @@ port 88 and port 750.
 .IP v4_mode
 This 
 .B string
-specifies how the KDC should respond to Kerberos IV packets. If this
-relation is not specified, the compiled-in default of
-.I nopreauth 
+specifies how the KDC should respond to Kerberos IV packets. Valid
+values for this relation are the same as the valid arguments to the
+.B -4
+flag to
+.BR krb5kdc .
+If this relation is not specified, the compiled-in default of
+.I none
 is used.
 
 .SH REALMS SECTION