summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2014-04-08 14:07:30 -0400
committerGreg Hudson <ghudson@mit.edu>2014-04-15 11:55:21 -0400
commit3b72cefb1bbf231192a2b92c31f2c91217f7d58c (patch)
treed2b0a92a8db1e506ee817bda12f20cfb68a253dc /doc
parent82aa5f56acee4d63800a1a69794a2d7bc4f104fc (diff)
downloadkrb5-3b72cefb1bbf231192a2b92c31f2c91217f7d58c.tar.gz
krb5-3b72cefb1bbf231192a2b92c31f2c91217f7d58c.tar.xz
krb5-3b72cefb1bbf231192a2b92c31f2c91217f7d58c.zip
Update sample configs to include master_kdc
Where we have ATHENA.MIT.EDU stanzas in sample or test krb5.conf files which define kdc entries, also define a master_kdc entry. Remove default_domain and v4_instance_convert entries in examples as they are only needed for krb5/krb4 principal conversions. In the krb5_conf.rst example, remove enctype specifications as we don't want to encourage their use when they aren't necessary, and remove a redundant domain_realm entry. ticket: 7901 (new)
Diffstat (limited to 'doc')
-rw-r--r--doc/admin/conf_files/krb5_conf.rst4
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
index 151894937..19ea9c904 100644
--- a/doc/admin/conf_files/krb5_conf.rst
+++ b/doc/admin/conf_files/krb5_conf.rst
@@ -1107,8 +1107,6 @@ Here is an example of a generic krb5.conf file:
[libdefaults]
default_realm = ATHENA.MIT.EDU
- default_tkt_enctypes = des3-hmac-sha1 des-cbc-crc
- default_tgs_enctypes = des3-hmac-sha1 des-cbc-crc
dns_lookup_kdc = true
dns_lookup_realm = false
@@ -1119,7 +1117,6 @@ Here is an example of a generic krb5.conf file:
kdc = kerberos-2.mit.edu:750
admin_server = kerberos.mit.edu
master_kdc = kerberos.mit.edu
- default_domain = mit.edu
}
EXAMPLE.COM = {
kdc = kerberos.example.com
@@ -1128,7 +1125,6 @@ Here is an example of a generic krb5.conf file:
}
[domain_realm]
- .mit.edu = ATHENA.MIT.EDU
mit.edu = ATHENA.MIT.EDU
[capaths]