From c9fde8c2d11744cc0875bc3e5dd0abf096211755 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Mon, 15 Sep 2014 12:01:09 +0200
Subject: Code cleanup and small enhancements

---
 include/tests_ldap | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

(limited to 'include/tests_ldap')

diff --git a/include/tests_ldap b/include/tests_ldap
index d41cd496..df931311 100644
--- a/include/tests_ldap
+++ b/include/tests_ldap
@@ -33,16 +33,16 @@
     Register --test-no LDAP-2219 --weight L --network NO --description "Check running OpenLDAP instance"
     if [ ${SKIPTEST} -eq 0 ]; then
         #YYY add additional slash
-        FIND=`${PSBINARY} ax | grep "slapd" | grep -v "grep"`
-        if [ "${FIND}" = "" ]; then
-   	    Display --indent 2 --text "- Checking OpenLDAP instance..." --result "NOT FOUND" --color WHITE
-	    logtext "Result: No running slapd process found."
+        IsRunning slapd
+        if [ ${RUNNING} -eq 0 ]; then
+            Display --indent 2 --text "- Checking OpenLDAP instance" --result "NOT FOUND" --color WHITE
+            logtext "Result: No running slapd process found."
           else
-    	    Display --indent 2 --text "- Checking OpenLDAP instance..." --result FOUND --color GREEN
-	    logtext "Result: Found running slapd process"
-	    SLAPDFOUND=1
-	    SLAPD_RUNNING=1
-	fi
+            Display --indent 2 --text "- Checking OpenLDAP instance" --result FOUND --color GREEN
+            logtext "Result: Found running slapd process"
+            SLAPDFOUND=1
+            SLAPD_RUNNING=1
+        fi
     fi
 #
 #################################################################################
@@ -52,21 +52,21 @@
     if [ ${SLAPD_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no LDAP-2224 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check presence slapd.conf"
     if [ ${SKIPTEST} -eq 0 ]; then
-	logtext "Test: Searching slapd.conf"
-	for I in ${SLAPD_CONF_LOCS}; do
-	    if [ -f ${I}/slapd.conf ]; then
-	        logtext "Result: found ${I}/slapd.conf"
-	        SLAPD_CONF_LOCATION="${I}/slapd.conf"
-	      else
-	        logtext "Result: ${I} does not contain slapd.conf"	
-	    fi
-	done
-	# Check if we found a valid location
-	if [ ! "${SLAPD_CONF_LOCATION}" = "" ]; then
-	    Display --indent 4 --text "- Checking slapd.conf..." --result FOUND --color GREEN
+        logtext "Test: Searching slapd.conf"
+        for I in ${SLAPD_CONF_LOCS}; do
+            if [ -f ${I}/slapd.conf ]; then
+                logtext "Result: found ${I}/slapd.conf"
+                SLAPD_CONF_LOCATION="${I}/slapd.conf"
+              else
+                logtext "Result: ${I} does not contain slapd.conf"
+            fi
+        done
+        # Check if we found a valid location
+        if [ ! "${SLAPD_CONF_LOCATION}" = "" ]; then
+            Display --indent 4 --text "- Checking slapd.conf" --result FOUND --color GREEN
           else
-	    Display --indent 4 --text "- Checking slapd.conf..." --result "NOT FOUND" --color YELLOW
-	fi
+            Display --indent 4 --text "- Checking slapd.conf" --result "NOT FOUND" --color YELLOW
+        fi
     fi
 #
 #################################################################################
@@ -97,7 +97,6 @@
 #################################################################################
 #
 
-
 wait_for_keypress
 
 #
-- 
cgit v1.2.3