[debian-edu-commits] r80022 - in branches/wheezy/debian-edu-config: debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-08 09:19:43 +0000 (Wed, 08 May 2013)
New Revision: 80022

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/ldap-client
Log:
Adjust ldap-client testsuite check to accept the new roaming
workstation configuration.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-08 09:06:43 UTC (rev 80021)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-08 09:19:43 UTC (rev 80022)
@@ -1,3 +1,11 @@
+debian-edu-config (1.704~svn80013) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Adjust ldap-client testsuite check to accept the new roaming
+    workstation configuration.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 08 May 2013 11:17:25 +0200
+
 debian-edu-config (1.704~svn80012) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/testsuite/ldap-client
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/ldap-client	2013-05-08 09:06:43 UTC (rev 80021)
+++ branches/wheezy/debian-edu-config/testsuite/ldap-client	2013-05-08 09:19:43 UTC (rev 80022)
@@ -50,7 +50,7 @@
 done
 
 # Verify that NSS is properly configured for netgroups in LDAP.
-if egrep '^netgroup: +files *.* +ldap$' /etc/nsswitch.conf ; then
+if egrep -q '^netgroup: +files *.* +(ldap|sss)$' /etc/nsswitch.conf ; then
     echo "success: $0: NSS netgroup setting is correct in /etc/nsswitch.conf"
 else
     echo "error: $0: NSS netgroup setting is wrong in /etc/nsswitch.conf"
@@ -71,7 +71,7 @@
 host -a "$ldap_server" | sed "s/^/info: LDAP server from DNS: /"
 
 if [ -f /etc/ldap/ldap.conf ] ; then
-    if grep -q "^HOST ldap" /etc/ldap/ldap.conf ; then
+    if egrep -q "^HOST (ldap|$ldap_server)" /etc/ldap/ldap.conf ; then
         :
     else
         echo "error: $0: ldap/ldap.conf misses definition of HOST ldap"
@@ -139,7 +139,7 @@
     group=admins
     if ldapsearch -ZZ -LLL -h $ldap_server -b $namingContexts \
                   -x "(&(cn=$group)(objectclass=posixGroup))" >/dev/null 2>&1 ; then
-        echo "success: $0: TLS search on $ldapserver for cn=$group returned OK exit code."
+        echo "success: $0: TLS search on $ldap_server for cn=$group returned OK exit code."
     elif ldapsearch -ZZ -LLL -h ldap.intern -b $namingContexts \
                   -x "(&(cn=$group)(objectclass=posixGroup))" >/dev/null 2>&1 ; then
         echo "success: $0: TLS search on ldap.intern for cn=$group returned OK exit code."