From e466757d0d2d4b50f5b31fb8a7814b96ac9b34b5 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: May 04 2005 23:37:57 +0000
Subject: - print a warning if slaptest fails, slaptest -u succeeds, and one of the

  directories listed as the storage location for a given suffix in slapd.conf
  contains a readable file named __db.001 (#118678)

---

diff --git a/ldap.init b/ldap.init
index 12f79f8..de0d5ce 100644
--- a/ldap.init
+++ b/ldap.init
@@ -112,7 +112,17 @@ function configtest() {
 		fi
 	done
 	# Check the configuration file.
-        action "Checking configuration files for $prog: " $slaptest || exit 1
+        if ! action $"Checking configuration files for $prog: " $slaptest ; then
+        	if $slaptest -u > /dev/null 2> /dev/null ; then
+			dirs=`LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' /etc/openldap/slapd.conf | awk '{print $2}'`
+			for directory in $dirs ; do
+				if test -r $directory/__db.001 ; then
+					echo -n $"stale lock files may be present in $directory" ; warning ; echo
+				fi
+			done
+		fi
+		exit 1
+	fi
 }
 
 function start() {
diff --git a/openldap.spec b/openldap.spec
index 67d0057..d649b63 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -712,6 +712,9 @@ fi
 * Wed May  4 2005 Nalin Dahyabhai <nalin@redhat.com> 2.2.26-1
 - update to 2.2.26 (stable 20050429)
 - enable the lmpasswd scheme
+- print a warning if slaptest fails, slaptest -u succeeds, and one of the
+  directories listed as the storage location for a given suffix in slapd.conf
+  contains a readable file named __db.001 (#118678)
 
 * Tue Apr 26 2005 Nalin Dahyabhai <nalin@redhat.com> 2.2.25-1
 - update to 2.2.25 (release)