svn rev #22257: branches/krb5-1-7/doc/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22257
Commit By: tlyu
Log Message:
ticket: 6451
version_fixed: 1.7

pull up r22187 from trunk

 ------------------------------------------------------------------------
 r22187 | ghudson | 2009-04-09 13:57:03 -0400 (Thu, 09 Apr 2009) | 9 lines
 Changed paths:
    M /trunk/doc/definitions.texinfo

 ticket: 6451
 subject: Update defaults in documentation
 tags: pullup
 target_version: 1.7

 doc/definitions.texinfo had, predictably, fallen out of date with
 respect to the code.  Update a few of the out of date comments and
 defaults, particularly the default enctype lists.


Changed Files:
U   branches/krb5-1-7/doc/definitions.texinfo
Modified: branches/krb5-1-7/doc/definitions.texinfo
===================================================================
--- branches/krb5-1-7/doc/definitions.texinfo	2009-04-15 20:07:51 UTC (rev 22256)
+++ branches/krb5-1-7/doc/definitions.texinfo	2009-04-15 20:07:53 UTC (rev 22257)
@@ -43,7 +43,7 @@
 the following should be consistent with the variables set in
 krb5/src/lib/krb5/krb/init_ctx.c
 @end ignore
- at set DefaultETypeList aes256-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 des-cbc-crc des-cbc-md5 des-cbc-md4 
+ at set DefaultETypeList aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 des-cbc-crc des-cbc-md5 des-cbc-md4 
 @comment DEFAULT_ETYPE_LIST
 @set DefaultDefaultTgsEnctypes @value{DefaultETypeList}
 @set DefaultDefaultTktEnctypes @value{DefaultETypeList}
@@ -66,7 +66,7 @@
 
 @ignore
 the following defaults should be consistent with default variables set
-in krb5/src/include/stock/osconf.h
+in krb5/src/include/osconf.hin
 @end ignore
 @set DefaultMasterKeyType des3-cbc-sha1
 @comment DEFAULT_KDC_ENCTYPE
@@ -102,14 +102,14 @@
 the following defaults should be consistent with the numbers set in
 krb5/src/lib/kadm5/alt_prof.c
 @end ignore
- at set DefaultMaxLife 10 hours 
- at comment line 608
+ at set DefaultMaxLife 24 hours 
+ at comment max_life
 @set DefaultMaxRenewableLife 0 
- at comment line 622
+ at comment max_rlife
 @set DefaultDefaultPrincipalExpiration 0 
- at comment line 639
- at set DefaultSupportedEnctypes des3-hmac-sha1:normal des-cbc-crc:normal
- at comment line 705
+ at comment expiration
+ at set DefaultSupportedEnctypes aes256-cts-hmac-sha1-96:normal aes128-cts-hmac-sha1-96:normal des3-cbc-sha1:normal arcfour-hmac-md5:normal
+ at comment krb5/src/include/osconf.hin, KRB5_DEFAULT_SUPPORTED_ENCTYPES
 
 @ignore
 the following defaults should be consistent with the values set in