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

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-07 19:05:08 +0000 (Sun, 07 Jul 2013)
New Revision: 81455

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/locate-syslog-collector
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-ad-client
Log:
Adjust setup-ad-client and locate-syslog-collector to handle dns
domain localdomain as no domain the same way sssd-generate-config
do.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-07 18:58:23 UTC (rev 81454)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-07 19:05:08 UTC (rev 81455)
@@ -3,6 +3,9 @@
   [ Petter Reinholdtsen ]
   * Correct webserver test suite, only check file permissions of
     profiles.ini on the Main Server where it exist.
+  * Adjust setup-ad-client and locate-syslog-collector to handle dns
+    domain localdomain as no domain the same way sssd-generate-config
+    do.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 07 Jul 2013 19:58:25 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/locate-syslog-collector
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/locate-syslog-collector	2013-07-07 18:58:23 UTC (rev 81454)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/locate-syslog-collector	2013-07-07 19:05:08 UTC (rev 81455)
@@ -12,7 +12,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

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-ad-client
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-ad-client	2013-07-07 18:58:23 UTC (rev 81454)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-ad-client	2013-07-07 19:05:08 UTC (rev 81455)
@@ -26,7 +26,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