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

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-21 08:43:45 +0000 (Tue, 21 May 2013)
New Revision: 80168

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, by looking for DNS domain in
resolv.conf if hostname is not FQDN.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-20 16:45:54 UTC (rev 80167)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-21 08:43:45 UTC (rev 80168)
@@ -1,7 +1,12 @@
 debian-edu-config (1.705~svn80139) UNRELEASED; urgency=low
 
+  [ Holger Levsen ]
   * debian/rules: add build-arch and build-indep targets. 
 
+  [ Petter Reinholdtsen ]
+  * Make sssd-generate-config more robust, by looking for DNS domain in
+    resolv.conf if hostname is not FQDN.
+
  -- Holger Levsen <holger at debian.org>  Mon, 20 May 2013 15:24:21 +0200
 
 debian-edu-config (1.705~svn80138) 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	2013-05-20 16:45:54 UTC (rev 80167)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config	2013-05-21 08:43:45 UTC (rev 80168)
@@ -72,6 +72,11 @@
 	domain=$1
     else
 	domain="$(hostname -d)"
+	# If hostname is not FQDN, look in DNS setup instead, to
+	# increase the chance of the automatic setup to work.
+	if [ -z "$domain" ] ; then
+	    domain=$(grep search /etc/resolv.conf |awk '{print $2}')
+	fi
     fi
     kerberosrealm=$(lookup_kerberos_realm $domain)
     ldapuri=$(lookup_ldap_uri "$domain")