summaryrefslogtreecommitdiffstats
path: root/src/util/profile
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 /src/util/profile
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 'src/util/profile')
-rw-r--r--src/util/profile/krb5.conf2
-rw-r--r--src/util/profile/profile.515
2 files changed, 9 insertions, 8 deletions
diff --git a/src/util/profile/krb5.conf b/src/util/profile/krb5.conf
index aefe4abb9..7d38e9e53 100644
--- a/src/util/profile/krb5.conf
+++ b/src/util/profile/krb5.conf
@@ -10,8 +10,8 @@
kdc = kerberos-1.mit.edu
kdc = kerberos-2.mit.edu
kdc = kerberos-3.mit.edu
+ master_kdc = kerberos.mit.edu
admin_server = kerberos.mit.edu
- default_domain = mit.edu
}
MEDIA-LAB.MIT.EDU = {
kdc = kerberos.media.mit.edu
diff --git a/src/util/profile/profile.5 b/src/util/profile/profile.5
index 7f3b36ab5..1b0748e61 100644
--- a/src/util/profile/profile.5
+++ b/src/util/profile/profile.5
@@ -24,11 +24,11 @@ An example profile file might look like this:
[realms]
ATHENA.MIT.EDU = {
- kdc = kerberos.mit.edu:88
- kdc = kerberos-1.mit.edu:88
- kdc = kerberos-2.mit.edu:88
- admin_server = kerberos.mit.edu:88
- default_domain = mit.edu
+ kdc = kerberos.mit.edu
+ kdc = kerberos-1.mit.edu
+ kdc = kerberos-2.mit.edu
+ master_kdc = kerberos.mit.edu
+ admin_server = kerberos.mit.edu
}
CYGNUS.COM = {
kdc = KERBEROS-1.CYGNUS.COM
@@ -65,7 +65,8 @@ sections have been marked as final:
[realms]
ATHENA.MIT.EDU = {
- kdc = kerberos.mit.edu:88
- admin_server = kerberos.mit.edu:88
+ kdc = kerberos.mit.edu
+ master_kdc = kerberos.mit.edu
+ admin_server = kerberos.mit.edu
}*