From 8f5ce824012f2caab6770df464f096c38dc4cb2e Mon Sep 17 00:00:00 2001
From: Ben Kaduk <kaduk@mit.edu>
Date: Mon, 12 Aug 2013 13:47:42 -0400
Subject: Remove redundant domain_realm mappings

This fixes a long-standing documentation bug where we claimed that
a domain_realm mapping for a host name would not affect entries
under that domain name.  The code has always had the behavior where
a host name mapping implies the corresponding domain name mapping,
since the 1.0 release.

While here, replace media-lab with csail in example files, as the
media lab realm is no longer in use.  Also strip port 88 from KDC
specifications, and drop the harmful default_{tgs,tkt}_enctypes
lines from src/util/profile/krb5.conf.

Further cleanup on these files to remove defunct realms may be in order.

ticket: 7690 (new)
tags: pullup
target_version: 1.11.4
---
 src/util/profile/krb5.conf | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'src/util/profile')

diff --git a/src/util/profile/krb5.conf b/src/util/profile/krb5.conf
index 73f58b90c..aefe4abb9 100644
--- a/src/util/profile/krb5.conf
+++ b/src/util/profile/krb5.conf
@@ -1,18 +1,15 @@
 [libdefaults]
 	default_realm = ATHENA.MIT.EDU 
-	default_tgs_enctypes = des-cbc-crc
-	default_tkt_enctypes = des-cbc-crc
-	default_keytab_name = FILE:/etc/krb5.keytab
 	kdc_timesync = 1
 	ccache_type = 4
 
 [realms] 
 	ATHENA.MIT.EDU = { 
 #		kdc = kerberos-2000.mit.edu
-		kdc = kerberos.mit.edu:88
-		kdc = kerberos-1.mit.edu:88
-		kdc = kerberos-2.mit.edu:88
-		kdc = kerberos-3.mit.edu:88
+		kdc = kerberos.mit.edu
+		kdc = kerberos-1.mit.edu
+		kdc = kerberos-2.mit.edu
+		kdc = kerberos-3.mit.edu
 		admin_server = kerberos.mit.edu
 		default_domain = mit.edu
 	} 
@@ -26,8 +23,8 @@
 		admin_server = casio.mit.edu
 	}
 	MOOF.MIT.EDU = {
-		kdc = three-headed-dogcow.mit.edu:88
-		kdc = three-headed-dogcow-1.mit.edu:88
+		kdc = three-headed-dogcow.mit.edu
+		kdc = three-headed-dogcow-1.mit.edu
 		admin_server = three-headed-dogcow.mit.edu
 	}
 	CYGNUS.COM = {
@@ -45,10 +42,8 @@
 	}
 
 [domain_realm]
-	.mit.edu = ATHENA.MIT.EDU
 	mit.edu = ATHENA.MIT.EDU
-	.media.mit.edu = MEDIA-LAB.MIT.EDU
-	media.mit.edu = MEDIA-LAB.MIT.EDU
+	csail.mit.edu = CSAIL.MIT.EDU
 
 [login]
 	krb4_convert = true
-- 
cgit