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

[pere at alioth.debian.org]

Author: pere
Date: 2013-04-30 10:22:15 +0000 (Tue, 30 Apr 2013)
New Revision: 79858

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/ldap-client
   branches/wheezy/debian-edu-config/testsuite/samba
Log:
Move PAM related check for winbind to ldap-client, to keep it next to the other PAM related checks.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-30 08:38:56 UTC (rev 79857)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-30 10:22:15 UTC (rev 79858)
@@ -1,8 +1,8 @@
 debian-edu-config (1.704~svn79806) UNRELEASED; urgency=low
 
   [ Petter Reinholdtsen ]
-  * Extend testsuite to detect if winbind and libpam-winbind is
-    active.  We do not want nor need them.
+  * Extend ldap-client testsuite check to detect if winbind or
+    libpam-winbind is active.  We do not want nor need them.
 
   [ Wolfgang Schweer ]
   * cf/cf.ldapclient: Get rid of packages winbind, libpam-winbind, and

Modified: branches/wheezy/debian-edu-config/testsuite/ldap-client
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/ldap-client	2013-04-30 08:38:56 UTC (rev 79857)
+++ branches/wheezy/debian-edu-config/testsuite/ldap-client	2013-04-30 10:22:15 UTC (rev 79858)
@@ -6,6 +6,8 @@
 LC_ALL=C
 export LC_ALL
 
+. /usr/share/debian-edu-config/testsuite-lib.sh
+
 if test -r /etc/debian-edu/config ; then
     . /etc/debian-edu/config
 fi
@@ -179,6 +181,20 @@
     echo "error: $0: Not only one PAM module of krb5, ldap and sss is enabled"
 fi
 
+# Make sure winbind isn't installed
+if deb_installed winbind ; then
+    echo "error: $0: winbind is installed"
+else
+    echo "success: $0: winbind is not installed"
+fi
+
+# Make sure winbind PAM module isn't active either
+if grep -q pam_winbind.so /etc/pam.d/common-auth; then
+    echo "error: $0: winbind PAM module is active"
+else
+    echo "success: $0: winbind PAM module is not active"
+fi
+
 if [ -r /etc/ldap/ldap.conf ]  ; then
     if grep -q '^TLS_REQCERT never' /etc/ldap/ldap.conf ; then
 	echo "error: $0: LDAP cert checking turned off in /etc/ldap/ldap.conf"

Modified: branches/wheezy/debian-edu-config/testsuite/samba
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/samba	2013-04-30 08:38:56 UTC (rev 79857)
+++ branches/wheezy/debian-edu-config/testsuite/samba	2013-04-30 10:22:15 UTC (rev 79858)
@@ -11,20 +11,6 @@
     . /etc/debian-edu/config
 fi
 
-# Make sure winbind isn't installed
-if deb_installed winbind ; then
-    echo "error: $0: winbind is installed"
-else
-    echo "success: $0: winbind is not installed"
-fi
-
-# Make sure winbind PAM module isn't active
-if grep -q pam_winbind.so /etc/pam.d/common-auth; then
-    echo "error: $0: winbind PAM module is active"
-else
-    echo "success: $0: winbind PAM module is not active"
-fi
-
 # Only Main-Server install samba
 if echo "$PROFILE" | egrep -q 'Main-Server' ; then
     :