[debian-edu-commits] r80258 - in trunk/src/educlient: debian etc

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-28 20:41:17 +0000 (Tue, 28 May 2013)
New Revision: 80258

Modified:
   trunk/src/educlient/debian/changelog
   trunk/src/educlient/etc/krb5.conf
Log:
Refresh krb5.conf content from wheezy and remove all unused settings.

Modified: trunk/src/educlient/debian/changelog
===================================================================
--- trunk/src/educlient/debian/changelog	2013-05-28 20:36:47 UTC (rev 80257)
+++ trunk/src/educlient/debian/changelog	2013-05-28 20:41:17 UTC (rev 80258)
@@ -6,6 +6,7 @@
   * Put files in /usr/ as part of the package, and stop using divert
     to put them in place.  No need to use postinst setup to make the
     binaries and perl module available.
+  * Refresh krb5.conf content from wheezy and remove all unused settings.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 28 May 2013 22:34:17 +0200
 

Modified: trunk/src/educlient/etc/krb5.conf
===================================================================
--- trunk/src/educlient/etc/krb5.conf	2013-05-28 20:36:47 UTC (rev 80257)
+++ trunk/src/educlient/etc/krb5.conf	2013-05-28 20:41:17 UTC (rev 80258)
@@ -1,7 +1,7 @@
 [libdefaults]
-	default_lookup_realm = true
-	default_realm = INTERN
-	allow_weak_crypto = true
+        dns_lookup_realm = true
+        dns_lookup_kdc = true
+# 	default_realm = INTERN
 
 # The following krb5.conf variables are only for MIT Kerberos.
 	krb4_config = /etc/krb.conf
@@ -39,94 +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 = vice28.fs.andrew.cmu.edu
-		kdc = vice2.fs.andrew.cmu.edu
-		kdc = vice11.fs.andrew.cmu.edu
-		kdc = vice12.fs.andrew.cmu.edu
-		admin_server = vice28.fs.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.dementia.org
-		kdc = kerberos2.dementia.org
-		admin_server = kerberos.dementia.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
-	}
 
 [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
+        .intern = INTERN
 
 [login]
 	krb4_convert = true