[debian-edu-commits] r80255 - in trunk/src/eduroaming: debian etc

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-28 19:38:50 +0000 (Tue, 28 May 2013)
New Revision: 80255

Modified:
   trunk/src/eduroaming/debian/changelog
   trunk/src/eduroaming/etc/krb5.conf
Log:
Remove unused settings from krb5.conf.

Modified: trunk/src/eduroaming/debian/changelog
===================================================================
--- trunk/src/eduroaming/debian/changelog	2013-05-28 18:44:29 UTC (rev 80254)
+++ trunk/src/eduroaming/debian/changelog	2013-05-28 19:38:50 UTC (rev 80255)
@@ -1,3 +1,10 @@
+eduroaming (0.3-1) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Remove unused settings from krb5.conf.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 28 May 2013 21:38:21 +0200
+
 eduroaming (0.2-1) unstable; urgency=low
 
   * [ Giorgio Pioda ]

Modified: trunk/src/eduroaming/etc/krb5.conf
===================================================================
--- trunk/src/eduroaming/etc/krb5.conf	2013-05-28 18:44:29 UTC (rev 80254)
+++ trunk/src/eduroaming/etc/krb5.conf	2013-05-28 19:38:50 UTC (rev 80255)
@@ -39,102 +39,14 @@
 	fcc-mit-ticketflags = true
 
 [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
-		default_domain = mit.edu
+        INTERN = {
+                kdc = kerberos.intern
+                admin_server = kerberos.intern
+                default_domain = intern
 	}
-	MEDIA-LAB.MIT.EDU = {
-		kdc = kerberos.media.mit.edu
-		admin_server = kerberos.media.mit.edu
-	}
-	ZONE.MIT.EDU = {
-		kdc = casio.mit.edu
-		kdc = seiko.mit.edu
-		admin_server = casio.mit.edu
-	}
-	MOOF.MIT.EDU = {
-		kdc = three-headed-dogcow.mit.edu:88
-		kdc = three-headed-dogcow-1.mit.edu:88
-		admin_server = three-headed-dogcow.mit.edu
-	}
-	CSAIL.MIT.EDU = {
-		kdc = kerberos-1.csail.mit.edu
-		kdc = kerberos-2.csail.mit.edu
-		admin_server = kerberos.csail.mit.edu
-		default_domain = csail.mit.edu
-		krb524_server = krb524.csail.mit.edu
-	}
-	IHTFP.ORG = {
-		kdc = kerberos.ihtfp.org
-		admin_server = kerberos.ihtfp.org
-	}
-	GNU.ORG = {
-		kdc = kerberos.gnu.org
-		kdc = kerberos-2.gnu.org
-		kdc = kerberos-3.gnu.org
-		admin_server = kerberos.gnu.org
-	}
-	1TS.ORG = {
-		kdc = kerberos.1ts.org
-		admin_server = kerberos.1ts.org
-	}
-	GRATUITOUS.ORG = {
-		kdc = kerberos.gratuitous.org
-		admin_server = kerberos.gratuitous.org
-	}
-	DOOMCOM.ORG = {
-		kdc = kerberos.doomcom.org
-		admin_server = kerberos.doomcom.org
-	}
-	ANDREW.CMU.EDU = {
-		kdc = kerberos.andrew.cmu.edu
-		kdc = kerberos2.andrew.cmu.edu
-		kdc = kerberos3.andrew.cmu.edu
-		admin_server = kerberos.andrew.cmu.edu
-		default_domain = andrew.cmu.edu
-	}
-	CS.CMU.EDU = {
-		kdc = kerberos.cs.cmu.edu
-		kdc = kerberos-2.srv.cs.cmu.edu
-		admin_server = kerberos.cs.cmu.edu
-	}
-	DEMENTIA.ORG = {
-		kdc = kerberos.dementix.org
-		kdc = kerberos2.dementix.org
-		admin_server = kerberos.dementix.org
-	}
-	stanford.edu = {
-		kdc = krb5auth1.stanford.edu
-		kdc = krb5auth2.stanford.edu
-		kdc = krb5auth3.stanford.edu
-		master_kdc = krb5auth1.stanford.edu
-		admin_server = krb5-admin.stanford.edu
-		default_domain = stanford.edu
-	}
-        UTORONTO.CA = {
-                kdc = kerberos1.utoronto.ca
-                kdc = kerberos2.utoronto.ca
-                kdc = kerberos3.utoronto.ca
-                admin_server = kerberos1.utoronto.ca
-                default_domain = utoronto.ca
-	}
 
 [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
-	csail.mit.edu = CSAIL.MIT.EDU
-	.whoi.edu = ATHENA.MIT.EDU
-	whoi.edu = ATHENA.MIT.EDU
-	.stanford.edu = stanford.edu
-	.slac.stanford.edu = SLAC.STANFORD.EDU
-        .toronto.edu = UTORONTO.CA
-        .utoronto.ca = UTORONTO.CA
+        .intern = INTERN
 
 [login]
 	krb4_convert = true