--- slapd	2009-03-19 11:04:17.000000000 +0100
+++ slapd.fixed	2009-08-10 07:45:15.000000000 +0200
@@ -45,7 +45,20 @@
 configure slapd during installation then you need to do so
 prior to attempting to start slapd.
 EOF
-  exit 0 # Should this be 1?
+  exit 0 # Should not be 1 to avoid installation scripts from failing
+fi
+
+# Stop processing if the config dir is used but empty
+if [ -d "$SLAPD_CONF" -a ! ( -r "$SLAPD_CONF/cn=config" -a -r "$SLAPD_CONF/cn=config.ldif" ) ]; then
+  cat <<EOF >&2
+The configuration directory was found for slapd at $SLAPD_CONF,
+but it contains no settings.
+If you have moved the slapd configuration directory please modify
+/etc/default/slapd to reflect this.  If you chose to not
+configure slapd during installation then you need to do so
+prior to attempting to start slapd.
+EOF
+  exit 0 # Should not be 1 to avoid installation scripts from failing
 fi
 
 # Find out the name of slapd's pid file