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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-13 10:25:02 +0000 (Thu, 13 Jun 2013)
New Revision: 80560

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config
Log:
Make sssd-generate-config more robust, to not fail when hostname
do not understand the -d argument.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-13 10:19:45 UTC (rev 80559)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-13 10:25:02 UTC (rev 80560)
@@ -7,6 +7,8 @@
   * Update sssd-generate-config with the change done to sssd.conf in
     version 1.704~svn79934, and generate sssd.conf with checking og
     the TLS certificate, now that it is working as it should.
+  * Make sssd-generate-config more robust, to not fail when hostname
+    do not understand the -d argument.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 13 Jun 2013 10:57:58 +0200
 

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	2013-06-13 10:19:45 UTC (rev 80559)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config	2013-06-13 10:25:02 UTC (rev 80560)
@@ -71,7 +71,7 @@
     if [ "$1" ] ; then
 	domain=$1
     else
-	domain="$(hostname -d)"
+	domain="$(hostname -d 2>/dev/null || true)"
 	# If hostname is not FQDN, look in DNS setup instead, to
 	# increase the chance of the automatic setup to work.
 	if [ -z "$domain" ] ; then