[debian-edu-commits] r83360 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2014-04-24 08:01:58 +0000 (Thu, 24 Apr 2014)
New Revision: 83360

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config
Log:
Fix problem with wrong LTSP Kerberos config during installation w/o network
connection.


Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2014-04-23 21:26:10 UTC (rev 83359)
+++ branches/wheezy/debian-edu-config/debian/changelog	2014-04-24 08:01:58 UTC (rev 83360)
@@ -1,8 +1,12 @@
 debian-edu-config (1.718) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Drop Vagrant Cascadian as uploader, on his request.
   * Add Indonesian web page translation from Kurniawan Haikal.
 
+  [ Wolfgang Schweer ]
+  * Fix sssd-create-config if installing w/o network connection.
+
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 02 Mar 2014 23:10:31 +0100
 
 debian-edu-config (1.717) unstable; urgency=low

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config	2014-04-23 21:26:10 UTC (rev 83359)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config	2014-04-24 08:01:58 UTC (rev 83360)
@@ -172,9 +172,11 @@
     kerberosrealm=$(lookup_kerberos_realm $dnsdomain)
     kerberosserver=$(lookup_kerberos_server "$dnsdomain")
     error=0
-    if [ -z "$kerberosserver" ];  then
+    if [ -z "$kerberosserver" || [ "reached" = "$kerberosserver" ] ; then
 	# autodetection failed, use defaults to avoid ending up with
 	# an empty file.
+	# Use defaults, too, if DNS failed (offline installation),
+	# cause all vars are set to 'reached' in this case.
 	dnsdomain=intern
 	kerberosrealm=INTERN
 	kerberosserver=kerberos