From: Tom Yu Date: Wed, 5 Nov 2014 20:57:51 +0000 (-0500) Subject: Update example enctypes in kdc_conf.rst X-Git-Tag: krb5-1.12.3-final~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77a9d61df42a9fc2457cb350bc98671020aff693;p=thirdparty%2Fkrb5.git Update example enctypes in kdc_conf.rst Use modern enctypes for values of master_key_type and supported_enctypes in the example kdc.conf in kdc_conf.rst. (cherry picked from commit 3eeb1a7eaa6757502d73944b7694405cdd571e1c) ticket: 8136 (new) version_fixed: 1.12.3 status: resolved --- diff --git a/doc/admin/conf_files/kdc_conf.rst b/doc/admin/conf_files/kdc_conf.rst index 987826642b..2dad2362e6 100644 --- a/doc/admin/conf_files/kdc_conf.rst +++ b/doc/admin/conf_files/kdc_conf.rst @@ -759,8 +759,8 @@ Here's an example of a kdc.conf file:: kadmind_port = 749 max_life = 12h 0m 0s max_renewable_life = 7d 0h 0m 0s - master_key_type = des3-hmac-sha1 - supported_enctypes = des3-hmac-sha1:normal des-cbc-crc:normal des-cbc-crc:v4 + master_key_type = aes256-cts-hmac-sha1-96 + supported_enctypes = aes256-cts-hmac-sha1-96:normal aes128-cts-hmac-sha1-96:normal database_module = openldap_ldapconf }