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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 43b4a7c3697c4d138679211ad0230980df9f1581
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Jan 25 23:52:46 2013 +0100

    Cosmetics and cleanup.  Remove 'allow_weak_crypto = true'.
    
    Remove Kerberos tweak 'allow_weak_crypto = true':  It is not needed
    anymore.

diff --git a/fai/config/files/usr/local/sbin/debian-lan/SERVER_A b/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
index e43f657..a5b4008 100755
--- a/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
+++ b/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
@@ -98,7 +98,7 @@ case $COMMAND in
 	    ## We have a file, one user per line.
 	    chmod 600 $1
 	    cat $1 | while read LINE; do
-		if [ ! -z "$LINE" ] && echo $LINE | grep -qv "^#" ; then
+		if [ -n "$LINE" ] && echo $LINE | grep -qv "^#" ; then
 		    USERID=`echo $LINE | awk '{print $1}'`
 		    PWD=`echo $LINE | awk '{print $2}'`
 		    if [ -z $PWD ] ;  then
@@ -133,7 +133,7 @@ case $COMMAND in
 	if [ -r $1 ] ; then
 	    ## We have a file, one user per line.
 	    cat $1 | while read LINE; do
-		if [ ! -z "$LINE" ] && echo $LINE | grep -qv "^#" ; then
+		if [ -n "$LINE" ] && echo $LINE | grep -qv "^#" ; then
 		    USERID=`echo $LINE | awk '{print $1}'`
 		    echo "---------------- $USERID ----------------"
 		    ## re-redirect standard input for kadmin:
diff --git a/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak b/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak
deleted file mode 100755
index b026251..0000000
--- a/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/sbin/cfagent -f
-
-control:
-   any::
-   actionsequence = ( editfiles )
-   EditFileSize = ( 30000 )
-
-editfiles:
-    any::
-      { ${target}/etc/krb5.conf
-      	## FIXME: Needed for NFSv4 because of #521878:
-        BeginGroupIfNoSuchLine '        allow_weak_crypto = true'
-          LocateLineMatching '.*\[libdefaults\].*'
-          InsertLine '        allow_weak_crypto = true'
-        EndGroup
-      }	
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index 159ba06..a5bbea6 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -5,7 +5,7 @@ set -e
 ## Add a local user account.
 ## You need to define USERNAME in class/SERVER_A.var to enable:
 
-if [ -n "$ROOTPW" ] && [ ! -z $USERNAME ] && ! $ROOTCMD getent passwd $USERNAME ; then
+if [ -n "$ROOTPW" ] && [ -n $USERNAME ] && ! $ROOTCMD getent passwd $USERNAME ; then
     $ROOTCMD adduser --disabled-login \
 	--gecos "local system administrator" $USERNAME
     $ROOTCMD usermod --password "$ROOTPW" $USERNAME

-- 
Debian-LAN development and packaging