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

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-07 09:13:06 +0000 (Sun, 07 Jul 2013)
New Revision: 81435

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config
Log:
In sssd-generate-config, tread dns domain localdomain as no domain
to look in resolv.conf for the domain to use instead.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-07 08:48:37 UTC (rev 81434)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-07 09:13:06 UTC (rev 81435)
@@ -1,3 +1,11 @@
+debian-edu-config (1.709~svn81435) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * In sssd-generate-config, tread dns domain localdomain as no domain
+    to look in resolv.conf for the domain to use instead.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 07 Jul 2013 11:12:37 +0200
+
 debian-edu-config (1.709~svn81434) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

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-07-07 08:48:37 UTC (rev 81434)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config	2013-07-07 09:13:06 UTC (rev 81435)
@@ -82,7 +82,7 @@
 	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" ] || [ "(null)" = "$domain" ]; then
+	if [ -z "$domain" ] || [ "(null)" = "$domain" ] || [ "localdomain" = "$domain" ]; then
 	    domain=$(grep search /etc/resolv.conf |awk '{print $2}')
 	fi
     fi