diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-04-09 17:57:03 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-04-09 17:57:03 +0000 |
| commit | 1358ab30265dd6e7cbda90a6dee45c3fa22b6e60 (patch) | |
| tree | 73513c5b62d69a5eb066f96a2e4a4d947e8d8012 | |
| parent | 671440878844e8dbbc8526badb3b1f615a88c9e0 (diff) | |
| download | krb5-1358ab30265dd6e7cbda90a6dee45c3fa22b6e60.tar.gz krb5-1358ab30265dd6e7cbda90a6dee45c3fa22b6e60.tar.xz krb5-1358ab30265dd6e7cbda90a6dee45c3fa22b6e60.zip | |
Update defaults in documentation
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
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22187 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | doc/definitions.texinfo | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/definitions.texinfo b/doc/definitions.texinfo index cce3905b40..2db0add174 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 |