From 3399217090995b45ffe9fece0bdfed9ccb933c54 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 15 Apr 2009 20:07:53 +0000 Subject: [PATCH] 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. ticket: 6451 version_fixed: 1.7 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22257 dc483132-0cff-0310-8789-dd5450dbe970 --- doc/definitions.texinfo | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/definitions.texinfo b/doc/definitions.texinfo index cce3905b4..2db0add17 100644 --- a/doc/definitions.texinfo +++ b/doc/definitions.texinfo @@ -43,7 +43,7 @@ default was set. the following should be consistent with the variables set in krb5/src/lib/krb5/krb/init_ctx.c @end ignore -@set DefaultETypeList aes256-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 des-cbc-crc des-cbc-md5 des-cbc-md4 +@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 @@ krb5/src/lib/krb5/krb/init_ctx.c @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 @@ in krb5/src/include/stock/osconf.h the following defaults should be consistent with the numbers set in krb5/src/lib/kadm5/alt_prof.c @end ignore -@set DefaultMaxLife 10 hours -@comment line 608 +@set DefaultMaxLife 24 hours +@comment max_life @set DefaultMaxRenewableLife 0 -@comment line 622 +@comment max_rlife @set DefaultDefaultPrincipalExpiration 0 -@comment line 639 -@set DefaultSupportedEnctypes des3-hmac-sha1:normal des-cbc-crc:normal -@comment line 705 +@comment expiration +@set DefaultSupportedEnctypes aes256-cts-hmac-sha1-96:normal aes128-cts-hmac-sha1-96:normal des3-cbc-sha1:normal arcfour-hmac-md5:normal +@comment krb5/src/include/osconf.hin, KRB5_DEFAULT_SUPPORTED_ENCTYPES @ignore the following defaults should be consistent with the values set in -- 2.26.2