[Pkg-openldap-devel] r1333 - openldap/trunk/debian

[matthijs at alioth.debian.org]

tags 597704 pending
thanks

Author: matthijs
Date: 2010-09-22 18:34:41 +0000 (Wed, 22 Sep 2010)
New Revision: 1333

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.scripts-common
Log:
 * Check for an empty variable when upgrading, otherwise we can cause an
   rm -f /*.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-09-13 06:59:36 UTC (rev 1332)
+++ openldap/trunk/debian/changelog	2010-09-22 18:34:41 UTC (rev 1333)
@@ -1,3 +1,9 @@
+openldap (2.4.23-6) UNRELEASED; urgency=high
+
+  * Check for an empty directory to prevent an rm -f /*. (Closes: #597704)
+
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Wed, 22 Sep 2010 20:17:40 +0200
+
 openldap (2.4.23-5) unstable; urgency=high
 
   [ Steve Langasek ]

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-09-13 06:59:36 UTC (rev 1332)
+++ openldap/trunk/debian/slapd.scripts-common	2010-09-22 18:34:41 UTC (rev 1333)
@@ -196,6 +196,9 @@
 	echo >&2 "  Loading from $dir: "
 	get_suffix | while read suffix; do
 		dbdir=`get_directory "$suffix"`
+		if [ -z "$dbdir" ]; then
+			continue
+		fi
 		if ! is_empty_dir "$dbdir"; then
 			echo >&2 \
 			  "  Directory $dbdir for $suffix not empty, aborting."