Index: univention-heimdal/conffiles/etc/krb5.conf
===================================================================
--- univention-heimdal/conffiles/etc/krb5.conf	(Revision 36805)
+++ univention-heimdal/conffiles/etc/krb5.conf	(Arbeitskopie)
@@ -11,8 +11,9 @@
 
 [libdefaults]
 @!@
-if configRegistry.has_key('kerberos/realm'):
-	print '\tdefault_realm = %s' % configRegistry['kerberos/realm']
+kerberos_realm = configRegistry.get('kerberos/realm')
+if kerberos_realm:
+	print '\tdefault_realm = %s' % kerberos_realm
 print '\tdefault_tgs_enctypes = %s' % configRegistry.get('kerberos/defaults/enctypes/tgs', 'des3-hmac-sha1 des-cbc-crc des-cbc-md4 des-cbc-md5 des3-cbc-sha1 arcfour-hmac-md5 aes128-cts-hmac-sha1-96 aes256-cts-hmac-sha1-96')
 print '\tdefault_tkt_enctypes = %s' % configRegistry.get('kerberos/defaults/enctypes/tkt', 'arcfour-hmac-md5 des-cbc-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md4 des3-cbc-sha1 aes128-cts-hmac-sha1-96 aes256-cts-hmac-sha1-96')
 print '\tpermitted_enctypes = %s'   % configRegistry.get('kerberos/defaults/enctypes/permitted', 'des3-hmac-sha1 des-cbc-crc des-cbc-md4 des-cbc-md5 des3-cbc-sha1 arcfour-hmac-md5 aes128-cts-hmac-sha1-96 aes256-cts-hmac-sha1-96')
@@ -34,19 +35,34 @@
 	for i in domain_realms:
 		print i
 
-if configRegistry.has_key('kerberos/realm'):
+kerberos_realm = configRegistry.get('kerberos/realm')
+kerberos_kdc = configRegistry.get('kerberos/kdc')
+kerberos_adminserver = configRegistry.get('kerberos/adminserver')
+kerberos_kpasswdserver = configRegistry.get('kerberos/kpasswdserver')
+if kerberos_realm:
 	print '[realms]'
-	print '%s = { ' % configRegistry['kerberos/realm']
+	print '%s = { ' % kerberos_realm
 	print '\tacl_file = /var/lib/heimdal-kdc/kadmind.acl'
-	if configRegistry.has_key('kerberos/kdc'):
-		print '\tkdc = %s' % configRegistry['kerberos/kdc']
-	if configRegistry.has_key('kerberos/adminserver'):
-		print '\tadmin_server = %s' % configRegistry['kerberos/adminserver']
-	if configRegistry.has_key('kerberos/kpasswdserver'):
-		print '\tkpasswd_server = %s' % configRegistry['kerberos/kpasswdserver']
+	if kerberos_kdc:
+		print '\tkdc = %s' % kerberos_kdc
+	if kerberos_adminserver:
+		print '\tadmin_server = %s' % kerberos_adminserver
+	if kerberos_kpasswdserver:
+		print '\tkpasswd_server = %s' % kerberos_kpasswdserver
 	print '}'
+
+windows_domain = configRegistry.get('windows/domain')
+if windows_domain:
+	if kerberos_realm:
+		print ''
+	else:
+		print '[realms]'
+	print '%s = { ' % windows_domain
+	print '\tkdc = %s' % (kerberos_kdc or "127.0.0.1:88")
+	print '\tadmin_server = %s' % (kerberos_adminserver or "127.0.0.1:88")
+	print '\tdefault_domain = %s' % configRegistry['domainname']
+	print '}'
 @!@
-	
 
 [kdc]
 hdb-ldap-create-base = cn=kerberos,@%@ldap/base@%@