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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit efcd4a38a862d14e447bed7600f379b652336551
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Mar 17 22:02:07 2013 +0100

    Minor fixes and improvements.
    
     * Make sure '/etc/hosts' is not modified.  (The removed line turned
       up in FAI 4.0.X, but spoils the system on softupdates, as the
       domain is not detected by idmapd anymore.)
     * Delegate kerberos credentials when ssh'ing.
     * Wording in debian/control.

diff --git a/debian/control b/debian/control
index 15b2d45..2e7a8c3 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Suggests: fai-server
 Description: FAI config space for the Debian-LAN system
  The Debian-LAN (Debian Local Area Network) project makes running
  Debian in a local area network easy without loosing flexibility.
- It may be used by schools, (university-) work groups, associations
- and small enterprises.
+ It may be used by schools, work groups, associations and small
+ enterprises.
  .
  Debian-LAN uses FAI (Fully Automatic Installation) to install and
  configure all machines in the network.
diff --git a/fai/config/scripts/CLIENT_A/10-kerberize b/fai/config/scripts/CLIENT_A/10-kerberize
index 5250ad8..bbc1698 100755
--- a/fai/config/scripts/CLIENT_A/10-kerberize
+++ b/fai/config/scripts/CLIENT_A/10-kerberize
@@ -8,6 +8,10 @@ control:
 editfiles:
    any::
 	{ ${target}/etc/ssh/sshd_config
-	  ## Kerberize ssh: 
+	  ## Kerberize sshd:
 	  ReplaceAll "#GSSAPIAuthentication no" With "GSSAPIAuthentication yes"
 	}
+	{ ${target}/etc/ssh/ssh_config
+	  ## Kerberize ssh:
+	  ReplaceAll "^ *GSSAPIDelegateCredentials no" With "    GSSAPIDelegateCredentials yes"
+	}
diff --git a/fai/config/scripts/FAIBASE/10-misc b/fai/config/scripts/FAIBASE/10-misc
index 6394ad2..5ed10e5 100755
--- a/fai/config/scripts/FAIBASE/10-misc
+++ b/fai/config/scripts/FAIBASE/10-misc
@@ -9,8 +9,6 @@ cp -f /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime
 
 if [ -n "$IPADDR" ]; then
     ifclass DHCPC || ainsl -s /etc/hosts "$IPADDR $HOSTNAME.$DOMAIN $HOSTNAME"
-else
-    ifclass DHCPC && ainsl -s /etc/hosts "127.0.0.1 $HOSTNAME"
 fi
 
 fcopy -iM /etc/hosts /etc/motd
diff --git a/fai/config/scripts/SERVER_A/40-kerberize b/fai/config/scripts/SERVER_A/40-kerberize
index 5250ad8..bbc1698 100755
--- a/fai/config/scripts/SERVER_A/40-kerberize
+++ b/fai/config/scripts/SERVER_A/40-kerberize
@@ -8,6 +8,10 @@ control:
 editfiles:
    any::
 	{ ${target}/etc/ssh/sshd_config
-	  ## Kerberize ssh: 
+	  ## Kerberize sshd:
 	  ReplaceAll "#GSSAPIAuthentication no" With "GSSAPIAuthentication yes"
 	}
+	{ ${target}/etc/ssh/ssh_config
+	  ## Kerberize ssh:
+	  ReplaceAll "^ *GSSAPIDelegateCredentials no" With "    GSSAPIDelegateCredentials yes"
+	}

-- 
Debian-LAN development and packaging