Vendor import of Heimdal 0.2n

2 files changed, 7 insertions, 10 deletions

diff --git a/crypto/heimdal/doc/kerberos4.texi b/crypto/heimdal/doc/kerberos4.texi
index 93671f9..2e4f92c 100644
--- a/crypto/heimdal/doc/kerberos4.texi
+++ b/crypto/heimdal/doc/kerberos4.texi
@@ -172,12 +172,8 @@ clients do send the password, so it's possible to to password quality
 checks). Because of this you can only create principals with des keys,
 and you can't set any flags or do any other fancy stuff.
 
-To get this to work, you have to create a @samp{changepw/kerberos}
-principal (if you are converting a version 4 data you should have this
-principal), and add it to the keytab the @samp{kadmind} is using. You
-then have to add another entry to inetd (since version 4 uses port 751,
-not 749).
+To get this to work, you have to add another entry to inetd (since
+version 4 uses port 751, not 749).
 
 @emph{And then there are a many more things you can do; more on this in
 a later version of this manual. Until then, UTSL.}
-
diff --git a/crypto/heimdal/doc/win2k.texi b/crypto/heimdal/doc/win2k.texi
index f5ec057..1a0e731 100644
--- a/crypto/heimdal/doc/win2k.texi
+++ b/crypto/heimdal/doc/win2k.texi
@@ -24,10 +24,11 @@ our not so inspired guesses.  Hopefully it's still somewhat useful.
 
 Windows 2000 supports both the standard DES encryptions (des-cbc-crc and
 des-cbc-md5) and its own proprietary encryption that is based on md4 and
-rc4 and which you cannot get hold of how it works with a NDA.  To enable
-a given principal to use DES, it needs to have DES keys in the database.
-To do this, you need to enable DES keys for the particular principal
-with the user administration tool and then change the password.
+rc4 and which is supposed to be described in
+draft-brezak-win2k-krb-rc4-hmac-01.txt.  To enable a given principal to
+use DES, it needs to have DES keys in the database.  To do this, you
+need to enable DES keys for the particular principal with the user
+administration tool and then change the password.
 
 @node Authorization data,  , Encryption types, Windows 2000 compatability
 @comment  node-name,  next,  previous,  up