From 64faf6e8317a9dfaacc14e13ec05b31863ae0ec6 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 31 May 2003 03:33:22 +0000
Subject: * krb5.conf: Delete Athena KDC specifications.  Delete Cygnus realm
 info. Replace CLUB.CC.CMU.EDU info with ANDREW.CMU.EDU, which has SRV records
 and thus doesn't need KDC specs.  Provide a commented-out example of a
 [logging] spec.

ticket: 1190
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15536 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/config-files/ChangeLog |  5 +++++
 src/config-files/krb5.conf | 18 +++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/config-files')

diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog
index c663313f56..878655ad1e 100644
--- a/src/config-files/ChangeLog
+++ b/src/config-files/ChangeLog
@@ -1,5 +1,10 @@
 2003-05-30  Ken Raeburn  <raeburn@mit.edu>
 
+	* krb5.conf: Delete Athena KDC specifications.  Delete Cygnus
+	realm info.  Replace CLUB.CC.CMU.EDU info with ANDREW.CMU.EDU,
+	which has SRV records and thus doesn't need KDC specs.  Provide a
+	commented-out example of a [logging] spec.
+
 	* krb5.conf.M: Remove "kdc =" lines from "realms" section example,
 	and recommend not using it unless DNS info isn't available.
 
diff --git a/src/config-files/krb5.conf b/src/config-files/krb5.conf
index 51f6aa8e5c..5c468913fb 100644
--- a/src/config-files/krb5.conf
+++ b/src/config-files/krb5.conf
@@ -8,9 +8,6 @@
 
 [realms]
 	ATHENA.MIT.EDU = {
-		kdc = KERBEROS-2.MIT.EDU:88
-		kdc = KERBEROS.MIT.EDU
-		kdc = KERBEROS-1.MIT.EDU
 		admin_server = KERBEROS.MIT.EDU
 		default_domain = MIT.EDU
 		v4_instance_convert = {
@@ -18,22 +15,15 @@
 			lithium = lithium.lcs.mit.edu
 		}
 	}
-	CYGNUS.COM = {
-		kdc = KERBEROS.CYGNUS.COM
-		kdc = KERBEROS-1.CYGNUS.COM
-		admin_server = KERBEROS.MIT.EDU
+	ANDREW.CMU.EDU = {
+		admin_server = vice28.fs.andrew.cmu.edu
 	}
+# use "kdc =" if realm admins haven't put SRV records into DNS
         GNU.ORG = {
                 kdc = kerberos.gnu.org
                 kdc = kerberos-2.gnu.org
                 admin_server = kerberos.gnu.org
         }
-CLUB.CC.CMU.EDU = {
-	kdc = kerberos.club.cc.cmu.edu
-	kdc = kerberos-1.club.cc.cmu.edu
-	admin_server = kerberos-admin.club.cc.cmu.edu
-	default_domain = club.cc.cmu.edu
-}
 
 [domain_realm]
 	.mit.edu = ATHENA.MIT.EDU
@@ -42,3 +32,5 @@ CLUB.CC.CMU.EDU = {
 	media.mit.edu = MEDIA-LAB.MIT.EDU
 	.ucsc.edu = CATS.UCSC.EDU
 
+[logging]
+#	kdc = CONSOLE
-- 
cgit