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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-13 11:47:32 +0000 (Thu, 13 Jun 2013)
New Revision: 80566

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config
Log:
Move code in sssd-generate-config to detect DNS domain name into
its own function, to make it easier to share that code with
setup-ad-client.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-13 11:43:37 UTC (rev 80565)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-13 11:47:32 UTC (rev 80566)
@@ -1,8 +1,14 @@
 debian-edu-config (1.707~svn80564) UNRELEASED; urgency=low
 
+  [ Holger Levsen ]
   * debian/control, Vcs* headers: Replace svn.debian.org with
     anonscm.debian.org.
 
+  [ Petter Reinholdtsen ]
+  * Move code in sssd-generate-config to detect DNS domain name into
+    its own function, to make it easier to share that code with
+    setup-ad-client.
+
  -- Holger Levsen <holger at debian.org>  Thu, 13 Jun 2013 13:42:45 +0200
 
 debian-edu-config (1.707~svn80562) wheezy-test; 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-06-13 11:43:37 UTC (rev 80565)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/sssd-generate-config	2013-06-13 11:47:32 UTC (rev 80566)
@@ -78,7 +78,7 @@
     fi
 }
 
-generate_config() {
+find_dns_domain() {
     if [ "$1" ] ; then
 	domain=$1
     else
@@ -89,6 +89,11 @@
 	    domain=$(grep search /etc/resolv.conf |awk '{print $2}')
 	fi
     fi
+    echo $domain
+}
+
+generate_config() {
+    domain=$(find_dns_domain "$1")
     kerberosrealm=$(lookup_kerberos_realm $domain)
     ldapuri=$(lookup_ldap_uri "$domain")
     if [ -z "$ldapuri" ];  then