[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. dbdf4717096be75350efc43d7c88d14bddef33bc

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 611dfa9cce94253c35bdfc3fe8afcad4e499d8d8
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sun Jan 29 02:06:21 2012 +0100

    Fix needed for squeeze since the 6.0.4 point release

diff --git a/fai/config/files/etc/krb5.conf/KDC_LDAP b/fai/config/files/etc/krb5.conf/KDC_LDAP
index 7f79e17..2f1337d 100644
--- a/fai/config/files/etc/krb5.conf/KDC_LDAP
+++ b/fai/config/files/etc/krb5.conf/KDC_LDAP
@@ -1,6 +1,7 @@
 [libdefaults]
         ## FIXME: needed because of #521878:
         allow_weak_crypto = true
+        permitted_enctypes = des-cbc-crc
         default_realm = INTERN
 
 [realms]
diff --git a/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak b/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak
index b026251..46d50e6 100755
--- a/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak
+++ b/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak
@@ -12,5 +12,6 @@ editfiles:
         BeginGroupIfNoSuchLine '        allow_weak_crypto = true'
           LocateLineMatching '.*\[libdefaults\].*'
           InsertLine '        allow_weak_crypto = true'
+          InsertLine '        permitted_enctypes = des-cbc-crc'
         EndGroup
       }	

-- 
Debian-LAN development and packaging